Re: [Qemu-devel] [RFT PATCH v1 16/30] isa/*: QOM casting sweep

[Peter Crosthwaite]

Hi Andreas,

On Tue, Jun 11, 2013 at 7:58 PM, Andreas Färber <address@hidden> wrote:
> Am 11.06.2013 08:52, schrieb address@hidden:
>> From: Peter Crosthwaite <address@hidden>
>>
>> Use standard QOM cast macros. Remove usage of DO_UPCAST and
>> direct -> style upcasting.
>>
>> Signed-off-by: Peter Crosthwaite <address@hidden>
>> ---
>>
>>  hw/isa/i82378.c   |  8 ++++----
>>  hw/isa/lpc_ich9.c |  6 +++---
>>  hw/isa/piix4.c    |  4 ++--
>>  hw/isa/vt82c686.c | 14 +++++++-------
>>  4 files changed, 16 insertions(+), 16 deletions(-)
> [...]
>> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
>> index d750413..1eb05b2 100644
>> --- a/hw/isa/piix4.c
>> +++ b/hw/isa/piix4.c
> [...]
>> @@ -98,7 +98,7 @@ int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
>>      PCIDevice *d;
>>
>>      d = pci_create_simple_multifunction(bus, devfn, true, "PIIX4");
>> -    *isa_bus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&d->qdev, 
>> "isa.0"));
>> +    *isa_bus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(DEVICE(d), 
>> "isa.0"));
>
> Conflict, my ISABus patch does ISA_BUS() in addition:
> http://patchwork.ozlabs.org/patch/249705/
>
>>      return d->devfn;
>>  }
>>
>> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
>> index 5261927..8ec0d84 100644
>> --- a/hw/isa/vt82c686.c
>> +++ b/hw/isa/vt82c686.c
> [...]
>> @@ -450,7 +450,7 @@ ISABus *vt82c686b_init(PCIBus *bus, int devfn)
>>
>>      d = pci_create_simple_multifunction(bus, devfn, true, "VT82C686B");
>>
>> -    return DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&d->qdev, "isa.0"));
>> +    return DO_UPCAST(ISABus, qbus, qdev_get_child_bus(DEVICE(d), "isa.0"));
>
> Ditto.
>

All come out in the wash in the rebase.

Regards,
Peter

>>  }
>>
>>  static void via_class_init(ObjectClass *klass, void *data)
>
> Otherwise looks fine.
>
> Andreas
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
>