From bb2ed009e7e4b278c0234143f6b6c1126f68ba35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Feb 2015 09:12:50 +0100 Subject: isa: add memory space parameter to isa_bus_new MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, keep current behaviour by always using get_system_memory(). Also use QOM casts when possible. Signed-off-by: Hervé Poussineau Reviewed-by: Paolo Bonzini Signed-off-by: Leon Alrae --- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_r4k.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/mips') diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 3f33093..de35299 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -219,7 +219,7 @@ static void mips_jazz_init(MemoryRegion *address_space, memory_region_add_subregion(address_space, 0x8000d000, dma_dummy); /* ISA devices */ - isa_bus = isa_bus_new(NULL, address_space_io); + isa_bus = isa_bus_new(NULL, get_system_memory(), address_space_io); i8259 = i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index a7fe0ce..5b982f2 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -268,7 +268,7 @@ void mips_r4k_init(MachineState *machine) cpu_mips_clock_init(env); /* The PIC is attached to the MIPS CPU INT0 pin */ - isa_bus = isa_bus_new(NULL, get_system_io()); + isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io()); i8259 = i8259_init(isa_bus, env->irq[2]); isa_bus_irqs(isa_bus, i8259); -- cgit v1.1