diff options
| author | Mark Cave-Ayland | 2020-12-29 18:56:15 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland | 2021-01-13 13:20:37 +0100 |
| commit | 370022ce313d0e797c969bd5be2be545c97f004d (patch) | |
| tree | 48e8fde8e4207c29f7993cd57e4d388451741672 /include/hw | |
| parent | mac_oldworld: move initialisation of grackle before heathrow (diff) | |
| download | qemu-370022ce313d0e797c969bd5be2be545c97f004d.tar.gz qemu-370022ce313d0e797c969bd5be2be545c97f004d.tar.xz qemu-370022ce313d0e797c969bd5be2be545c97f004d.zip | |
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 <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201229175619.6051-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'include/hw')
| -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 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]; |