Re: [Qemu-devel] [PATCH 12/16] qdev: Pass size to qbus_create_inplace()

["Andreas Färber" <afaerber@suse.de>]

Am 26.08.2013 10:03, schrieb Cornelia Huck:
> On Sat, 24 Aug 2013 02:00:32 +0200
> Andreas Färber <afaerber@suse.de> wrote:
> 
>> To be passed to object_initialize().
>>
>> Since commit 39355c3826f5d9a2eb1ce3dc9b4cdd68893769d6 the argument is
>> void*, so drop some superfluous (BusState *) casts or direct parent
>> field usages.
>>
>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>> ---
>>  hw/audio/intel-hda.c          | 2 +-
>>  hw/char/ipack.c               | 2 +-
>>  hw/char/virtio-serial-bus.c   | 4 ++--
>>  hw/core/qdev.c                | 2 +-
>>  hw/core/sysbus.c              | 4 ++--
>>  hw/cpu/icc_bus.c              | 3 ++-
>>  hw/ide/qdev.c                 | 2 +-
>>  hw/misc/macio/cuda.c          | 4 ++--
>>  hw/pci/pci.c                  | 2 +-
>>  hw/pci/pci_bridge.c           | 3 ++-
>>  hw/s390x/event-facility.c     | 4 ++--
>>  hw/s390x/s390-virtio-bus.c    | 4 ++--
>>  hw/s390x/virtio-ccw.c         | 4 ++--
>>  hw/scsi/scsi-bus.c            | 2 +-
>>  hw/usb/bus.c                  | 2 +-
>>  hw/usb/dev-smartcard-reader.c | 3 ++-
>>  hw/virtio/virtio-mmio.c       | 2 +-
>>  hw/virtio/virtio-pci.c        | 2 +-
>>  include/hw/qdev-core.h        | 2 +-
>>  19 files changed, 28 insertions(+), 25 deletions(-)
>>
> 
>> diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
>> index 579adbc..e95b831 100644
>> --- a/hw/s390x/s390-virtio-bus.c
>> +++ b/hw/s390x/s390-virtio-bus.c
>> @@ -699,8 +699,8 @@ static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size,
>>      BusState *qbus;
>>      char virtio_bus_name[] = "virtio-bus";
>>
>> -    qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_S390_BUS, qdev,
>> -                        virtio_bus_name);
>> +    qbus_create_inplace((BusState *)bus, bus_size, TYPE_VIRTIO_S390_BUS,
>> +                        qdev, virtio_bus_name);
>>      qbus = BUS(bus);
>>      qbus->allow_hotplug = 1;
>>  }
>> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
>> index 36cbf42..cf7075e 100644
>> --- a/hw/s390x/virtio-ccw.c
>> +++ b/hw/s390x/virtio-ccw.c
>> @@ -1297,8 +1297,8 @@ static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size,
>>      BusState *qbus;
>>      char virtio_bus_name[] = "virtio-bus";
>>
>> -    qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_CCW_BUS, qdev,
>> -                        virtio_bus_name);
>> +    qbus_create_inplace((BusState *)bus, bus_size, TYPE_VIRTIO_CCW_BUS,
>> +                        qdev, virtio_bus_name);
>>      qbus = BUS(bus);
>>      qbus->allow_hotplug = 1;
>>  }
> 
> You'll probably want to drop the superflous casts here as well :)

Fixed, thanks!

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg