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>
This commit is contained in:
Mark Cave-Ayland committed 2021-01-13 12:21:10 +00:00
1 parent 6ce97b225e
commit 7e4d62dfee
3 files changed
+21 -25

No files matched your search

+1 -1
View File
@@ -115,7 +115,7 @@ struct NewWorldMacIOState {
bool has_pmu;
bool has_adb;
OpenPICState *pic;
OpenPICState pic;
MACIOIDEState ide[2];
MacIOGPIOState gpio;
};