From 7e4d62dfee40e7d94c72644d2d29bbd33db91bed Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Tue, 29 Dec 2020 17:56:17 +0000 Subject: 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 Reviewed-by: David Gibson Message-Id: <20201229175619.6051-6-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- include/hw/misc/macio/macio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/hw/misc/macio/macio.h') 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; }; -- cgit 1.4.1