From 370022ce313d0e797c969bd5be2be545c97f004d Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Tue, 29 Dec 2020 17:56:15 +0000 Subject: macio: move heathrow PIC inside macio-oldworld device The heathrow PIC is located within the macio device on real hardware so make it a child of the macio-oldworld device. This also removes the need for setting and checking a separate PIC object property link on the macio-oldworld 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-4-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') diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h index 22b4e64b2c..707dfab50c 100644 --- a/include/hw/misc/macio/macio.h +++ b/include/hw/misc/macio/macio.h @@ -99,7 +99,7 @@ struct OldWorldMacIOState { MacIOState parent_obj; /*< public >*/ - HeathrowState *pic; + HeathrowState pic; MacIONVRAMState nvram; MACIOIDEState ide[2]; -- cgit v1.2.3