diff options
author | Andreas Färber <afaerber@suse.de> | 2013-08-24 00:02:27 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-08-30 21:15:35 +0200 |
commit | fb17dfe0575243a3f60dcefca37fa82ae682f146 (patch) | |
tree | e2b1bc60fe8cd608b5655c475793667da9f696ad /hw/char | |
parent | e5f720391e0628131cb6548b3d27be6aa56ae7d4 (diff) | |
download | qemu-fb17dfe0575243a3f60dcefca37fa82ae682f146.tar.gz qemu-fb17dfe0575243a3f60dcefca37fa82ae682f146.tar.bz2 qemu-fb17dfe0575243a3f60dcefca37fa82ae682f146.zip |
qdev: Pass size to qbus_create_inplace()
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>
Diffstat (limited to 'hw/char')
-rw-r--r-- | hw/char/ipack.c | 2 | ||||
-rw-r--r-- | hw/char/virtio-serial-bus.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/char/ipack.c b/hw/char/ipack.c index 5fb70738f8..b7e45bedb2 100644 --- a/hw/char/ipack.c +++ b/hw/char/ipack.c @@ -29,7 +29,7 @@ void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size, const char *name, uint8_t n_slots, qemu_irq_handler handler) { - qbus_create_inplace(&bus->qbus, TYPE_IPACK_BUS, parent, name); + qbus_create_inplace(bus, bus_size, TYPE_IPACK_BUS, parent, name); bus->n_slots = n_slots; bus->set_irq = handler; } diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index f23f555dde..703f026370 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -911,8 +911,8 @@ static int virtio_serial_device_init(VirtIODevice *vdev) sizeof(struct virtio_console_config)); /* Spawn a new virtio-serial bus on which the ports will ride as devices */ - qbus_create_inplace(&vser->bus.qbus, TYPE_VIRTIO_SERIAL_BUS, qdev, - vdev->bus_name); + qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS, + qdev, vdev->bus_name); vser->bus.qbus.allow_hotplug = 1; vser->bus.vser = vser; QTAILQ_INIT(&vser->ports); |