diff options
| author | Mark Cave-Ayland | 2018-02-28 21:32:36 +0100 |
|---|---|---|
| committer | David Gibson | 2018-03-06 03:16:29 +0100 |
| commit | c29646009a6a5428cf13600281f7d51eba9e8458 (patch) | |
| tree | 3e31f1b65905e5959638b03a4d4e31ffbf166e73 /hw/ppc/mac.h | |
| parent | heathrow: convert to trace-events (diff) | |
| download | qemu-c29646009a6a5428cf13600281f7d51eba9e8458.tar.gz qemu-c29646009a6a5428cf13600281f7d51eba9e8458.tar.xz qemu-c29646009a6a5428cf13600281f7d51eba9e8458.zip | |
heathrow: change heathrow_pic_init() to return the heathrow device
This enables the device to be made available during the setup of the Old World
machine. In order to pass back the previous set of IRQs we temporarily introduce
a new pic_irqs parameter until it can be removed.
An additional benefit of this change is that it is also possible to remove the
pic_mem pointer used for macio by accessing the memory region via sysbus.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/mac.h')
| -rw-r--r-- | hw/ppc/mac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index 261b519aa5..5b5fffdff3 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -79,8 +79,8 @@ void macio_init(PCIDevice *dev, MemoryRegion *pic_mem); /* Heathrow PIC */ -qemu_irq *heathrow_pic_init(MemoryRegion **pmem, - int nb_cpus, qemu_irq **irqs); +DeviceState *heathrow_pic_init(int nb_cpus, qemu_irq **irqs, + qemu_irq **pic_irqs); /* Grackle PCI */ #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost" |