aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2020-12-29 17:56:17 +0000
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2021-01-13 12:21:10 +0000
commit7e4d62dfee40e7d94c72644d2d29bbd33db91bed (patch)
tree02efbaa8c2762236ef5555c7b2da33db8179fa8b /include
parent6ce97b225eeba491f843cd01f28d1b3566d56f90 (diff)
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')
-rw-r--r--include/hw/misc/macio/macio.h2
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;
};