diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2023-06-21 09:53:51 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2023-06-22 09:30:11 +0200 |
| commit | 7a1f3acb3f41a6bc896c1d7d1749336c21eb8cee (patch) | |
| tree | 94e3bf8b6d1e4b39a8acb8bfb4074522fc5c7c7c /include/hw | |
| parent | 464085e8f6776a0ca5a2677cf8b93b25c8a94da4 (diff) | |
| download | focaccia-qemu-7a1f3acb3f41a6bc896c1d7d1749336c21eb8cee.tar.gz focaccia-qemu-7a1f3acb3f41a6bc896c1d7d1749336c21eb8cee.zip | |
q800: move macfb device to Q800MachineState
Also change the instantiation of the macfb device to use object_initialize_child(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20230621085353.113233-23-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/m68k/q800.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h index 8f2c572a81..b3d77f1cba 100644 --- a/include/hw/m68k/q800.h +++ b/include/hw/m68k/q800.h @@ -35,6 +35,7 @@ #include "hw/scsi/esp.h" #include "hw/block/swim.h" #include "hw/nubus/mac-nubus-bridge.h" +#include "hw/display/macfb.h" /* * The main Q800 machine @@ -54,6 +55,7 @@ struct Q800MachineState { SysBusESPState esp; Swim swim; MacNubusBridge mac_nubus_bridge; + MacfbNubusState macfb; MemoryRegion macio; MemoryRegion macio_alias; }; |