diff options
| author | Mark Cave-Ayland | 2018-02-28 21:32:38 +0100 |
|---|---|---|
| committer | David Gibson | 2018-03-06 03:16:29 +0100 |
| commit | 017812df5d97e587a6eef03ec5a9e94a471439f9 (patch) | |
| tree | 6cfa1f14a296c33a2398df3cee037e4fef51f51d /include/hw/misc | |
| parent | macio: move macio related structures and defines into separate macio.h file (diff) | |
| download | qemu-017812df5d97e587a6eef03ec5a9e94a471439f9.tar.gz qemu-017812df5d97e587a6eef03ec5a9e94a471439f9.tar.xz qemu-017812df5d97e587a6eef03ec5a9e94a471439f9.zip | |
mac_oldworld: use object link to pass heathrow PIC object to macio
Also switch macio_oldworld_realize() over to use it rather than using the pic_mem
memory region directly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include/hw/misc')
| -rw-r--r-- | include/hw/misc/macio/macio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h index e1e249f898..843c114c07 100644 --- a/include/hw/misc/macio/macio.h +++ b/include/hw/misc/macio/macio.h @@ -26,6 +26,7 @@ #ifndef MACIO_H #define MACIO_H +#include "hw/intc/heathrow_pic.h" #include "hw/misc/macio/cuda.h" #include "hw/ppc/mac_dbdma.h" @@ -54,6 +55,7 @@ typedef struct OldWorldMacIOState { MacIOState parent_obj; /*< public >*/ + HeathrowState *pic; qemu_irq irqs[7]; MacIONVRAMState nvram; |