[v2,01/10] 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 <hpoussin@reactos.org>
---
 hw/ppc/prep.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Il 04/09/2013 00:29, Hervé Poussineau ha scritto:
> 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 <hpoussin@reactos.org>
> ---
>  hw/ppc/prep.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 7e04b1a..efc892d 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
> 

Should it be instead the I/O address space of the Raven instead
(pci_bus->address_space_io, or alternatively you could add a new
function)?  Or if you make it the ISA address space, should this be a
new, full-blown ISA device?

Paolo

Paolo Bonzini a écrit :
> Il 04/09/2013 00:29, Hervé Poussineau ha scritto:
>> 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 <hpoussin@reactos.org>
>> ---
>>  hw/ppc/prep.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
>> index 7e04b1a..efc892d 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
>>
> 
> Should it be instead the I/O address space of the Raven instead
> (pci_bus->address_space_io, or alternatively you could add a new
> function)?  Or if you make it the ISA address space, should this be a
> new, full-blown ISA device?

Yes, this should be replaced by a full-blow ISA device. However, this 
patchset is for the raven PCI host, so I tried to do only minimal and 
required changes in other parts.

Regards,

Hervé