r2074 broke ata module

[Ward Vandewege]

Hi there,

I tried to use the ata module today in combination with grub2's coreboot
code, but found that it broke in r2074, specifically by this hunk:

------------------------------------------------------------------------
--- include/grub/pci.h  (revision 2073)
+++ include/grub/pci.h  (working copy)
@@ -36,8 +36,8 @@
 #define  GRUB_PCI_ADDR_IO_MASK         ~0x03
 
 typedef grub_uint32_t grub_pci_id_t;
-typedef int (*grub_pci_iteratefunc_t) (int bus, int device, int func,
-                                      grub_pci_id_t pciid);
+typedef int NESTED_FUNC_ATTR (*grub_pci_iteratefunc_t)
+     (int bus, int device, int func, grub_pci_id_t pciid);
 typedef grub_uint32_t grub_pci_address_t;
 
 grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (int bus, int device,
------------------------------------------------------------------------

Reverting that hunk fixes ata for me. The symptom of a broken ata module is
that it does not see any ATA disks.

I'm testing on qemu, and start qemu like this:

  qemu -m 1024 -serial stdio -L qemu-cbv2-grub2/ -hda path-to-image

Up to r2073, that image shows up as ata0, from r2074 it's simply not
detected.

Thoughts?

Thanks,
Ward.