No need to create a local ISA I/O MemoryRegion, use get_system_io(). This partly reverts commit 5c63bcf7501527b844f61624957bdba254d75bfc.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- hw/mips/jazz.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1a0888a0fd5..9ac9361b7eb 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -158,7 +158,6 @@ static void mips_jazz_init(MachineState *machine, rc4030_dma *dmas; IOMMUMemoryRegion *rc4030_dma_mr; MemoryRegion *isa_mem = g_new(MemoryRegion, 1); - MemoryRegion *isa_io = g_new(MemoryRegion, 1); MemoryRegion *rtc = g_new(MemoryRegion, 1); MemoryRegion *i8042 = g_new(MemoryRegion, 1); MemoryRegion *dma_dummy = g_new(MemoryRegion, 1); @@ -259,11 +258,10 @@ static void mips_jazz_init(MachineState *machine, memory_region_add_subregion(address_space, 0x8000d000, dma_dummy); /* ISA bus: IO space at 0x90000000, mem space at 0x91000000 */ - memory_region_init(isa_io, NULL, "isa-io", 0x00010000); memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); - memory_region_add_subregion(address_space, 0x90000000, isa_io); + memory_region_add_subregion(address_space, 0x90000000, get_system_io()); memory_region_add_subregion(address_space, 0x91000000, isa_mem); - isa_bus = isa_bus_new(NULL, isa_mem, isa_io, &error_abort); + isa_bus = isa_bus_new(NULL, isa_mem, get_system_io(), &error_abort); /* ISA devices */ i8259 = i8259_init(isa_bus, env->irq[4]); -- 2.26.2