From: Hervé Poussineau Date: Mon, 4 Nov 2013 23:09:43 +0000 (+0100) Subject: prep: Kill get_system_io() usage X-Git-Tag: qemu-xen-4.5.0-rc1~199^2~2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c0f2bf9b3f6d8b5961b47b0affbb5456e6123e68;p=qemu-upstream-4.6-testing.git prep: Kill get_system_io() usage While ISA address space in prep machine is currently the one returned by get_system_io(), this depends of the implementation of i82378/raven devices, and this may not be the case forever. Use the right ISA address space when adding some more ports to it. We can use whatever ISA device on the right ISA bus, as all ISA devices on the same ISA bus share the same ISA address space. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index aad0f6911..9f8538cd2 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -656,7 +656,7 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) sysctrl->reset_irq = cpu->env.irq_inputs[PPC6xx_INPUT_HRESET]; portio_list_init(port_list, NULL, prep_portio_list, sysctrl, "prep"); - portio_list_add(port_list, get_system_io(), 0x0); + portio_list_add(port_list, isa_address_space_io(isa), 0x0); /* PowerPC control and status register group */ #if 0