diff options
| author | Mark Cave-Ayland | 2018-03-06 21:30:58 +0100 |
|---|---|---|
| committer | David Gibson | 2018-04-27 10:05:22 +0200 |
| commit | e7755cc1142db474bfa47247a92c59996af0502a (patch) | |
| tree | a27440f1cbae0dcf71ea45b62c574af47a8251b0 /include/hw/pci-host | |
| parent | uninorth: remove obsolete pci_pmac_u3_init() function (diff) | |
| download | qemu-e7755cc1142db474bfa47247a92c59996af0502a.tar.gz qemu-e7755cc1142db474bfa47247a92c59996af0502a.tar.xz qemu-e7755cc1142db474bfa47247a92c59996af0502a.zip | |
uninorth: use object link to pass OpenPIC object to uninorth
Now that the OpenPIC is wired up via the board, we can now remove our temporary
PIC qdev pointer property and replace it with an object link instead.
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 'include/hw/pci-host')
| -rw-r--r-- | include/hw/pci-host/uninorth.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h index e4fa11c145..e048fd56e8 100644 --- a/include/hw/pci-host/uninorth.h +++ b/include/hw/pci-host/uninorth.h @@ -27,6 +27,8 @@ #include "hw/hw.h" +#include "hw/ppc/openpic.h" + #define TYPE_UNI_NORTH_PCI_HOST_BRIDGE "uni-north-pci-pcihost" #define TYPE_UNI_NORTH_AGP_HOST_BRIDGE "uni-north-agp-pcihost" #define TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE "uni-north-internal-pci-pcihost" @@ -44,7 +46,8 @@ typedef struct UNINState { PCIHostState parent_obj; - void *pic_irqs; + OpenPICState *pic; + qemu_irq irqs[4]; MemoryRegion pci_mmio; MemoryRegion pci_hole; } UNINState; |