motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

q800: move mac-nubus-bridge device to Q800MachineState

Browse source 
Also change the instantiation of the mac-nubus-bridge device to use
object_initialize_child() and map the Nubus address space using
memory_region_add_subregion() instead of sysbus_mmio_map().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-21-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Mark Cave-Ayland 2023-06-21 09:53:49 +01:00 • committed by Laurent Vivier
parent 01f35a4f1c
commit 36df1c5a63
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/hw/m68k/q800.h
View file

@ -34,6 +34,7 @@
#include "hw/or-irq.h"
#include "hw/scsi/esp.h"
#include "hw/block/swim.h"
#include "hw/nubus/mac-nubus-bridge.h"
/*
* The main Q800 machine
@ -52,6 +53,7 @@ struct Q800MachineState {
OrIRQState escc_orgate;
SysBusESPState esp;
Swim swim;
MacNubusBridge mac_nubus_bridge;
MemoryRegion macio;
MemoryRegion macio_alias;
};