diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2018-03-06 22:01:55 +0000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-04-27 18:05:22 +1000 |
| commit | b0318ec10b2a97cac0cdce50a693a11f882c8549 (patch) | |
| tree | 6b41d2c5dc8bff6e81ba83fcd07230ddeb636c8e /hw/ppc | |
| parent | a5ed75fe2e6625b2ab9ed0694d7a5c95a74b84f7 (diff) | |
| download | focaccia-qemu-b0318ec10b2a97cac0cdce50a693a11f882c8549.tar.gz focaccia-qemu-b0318ec10b2a97cac0cdce50a693a11f882c8549.zip | |
grackle: general tidy-up and QOMify
This is the first step towards removing the old-style pci_grackle_init() function. Following on from the previous commit we can now pass the heathrow device as an object link and wire up the heathrow IRQs via qdev GPIOs. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/mac.h | 2 | ||||
| -rw-r--r-- | hw/ppc/mac_oldworld.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index d661515e9d..695557b8bf 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -79,7 +79,7 @@ void macio_init(PCIDevice *dev, /* Grackle PCI */ #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost" -PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, +PCIBus *pci_grackle_init(uint32_t base, DeviceState *pic_dev, MemoryRegion *address_space_mem, MemoryRegion *address_space_io); diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 9bd4ece16d..d48abfef07 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -261,7 +261,7 @@ static void ppc_heathrow_init(MachineState *machine) exit(1); } - pci_bus = pci_grackle_init(0xfec00000, pic, + pci_bus = pci_grackle_init(0xfec00000, pic_dev, get_system_memory(), get_system_io()); pci_vga_init(pci_bus); |