diff options
| author | Mark Cave-Ayland | 2020-12-29 18:56:17 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland | 2021-01-13 13:21:10 +0100 |
| commit | 7e4d62dfee40e7d94c72644d2d29bbd33db91bed (patch) | |
| tree | 02efbaa8c2762236ef5555c7b2da33db8179fa8b /include/hw/misc/macio/macio.h | |
| parent | mac_newworld: delay wiring of PCI IRQs in New World machine (diff) | |
| download | qemu-7e4d62dfee40e7d94c72644d2d29bbd33db91bed.tar.gz qemu-7e4d62dfee40e7d94c72644d2d29bbd33db91bed.tar.xz qemu-7e4d62dfee40e7d94c72644d2d29bbd33db91bed.zip | |
macio: move OpenPIC inside macio-newworld device
The OpenPIC device is located within the macio device on real hardware so make it
a child of the macio-newworld device. This also removes the need for setting and
checking a separate PIC object property link on the macio-newworld device which
currently causes the automated QOM introspection tests to fail.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-6-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'include/hw/misc/macio/macio.h')
| -rw-r--r-- | include/hw/misc/macio/macio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h index 707dfab50c..6c05f3bfd2 100644 --- a/include/hw/misc/macio/macio.h +++ b/include/hw/misc/macio/macio.h @@ -115,7 +115,7 @@ struct NewWorldMacIOState { bool has_pmu; bool has_adb; - OpenPICState *pic; + OpenPICState pic; MACIOIDEState ide[2]; MacIOGPIOState gpio; }; |