[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/30] virtio-serial: QOM realize preparations
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 16/30] virtio-serial: QOM realize preparations |
Date: |
Mon, 9 Dec 2013 21:48:18 +0100 |
From: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/char/virtio-serial-bus.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index a7ede90..313a5d8 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -891,8 +891,9 @@ static int virtser_port_qdev_exit(DeviceState *qdev)
static int virtio_serial_device_init(VirtIODevice *vdev)
{
- DeviceState *qdev = DEVICE(vdev);
- VirtIOSerial *vser = VIRTIO_SERIAL(vdev);
+ DeviceState *dev = DEVICE(vdev);
+ VirtIOSerial *vser = VIRTIO_SERIAL(dev);
+ BusState *bus;
uint32_t i, max_supported_ports;
if (!vser->serial.max_virtserial_ports) {
@@ -912,8 +913,9 @@ static int virtio_serial_device_init(VirtIODevice *vdev)
/* Spawn a new virtio-serial bus on which the ports will ride as devices */
qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS,
- qdev, vdev->bus_name);
- vser->bus.qbus.allow_hotplug = 1;
+ dev, vdev->bus_name);
+ bus = BUS(&vser->bus);
+ bus->allow_hotplug = 1;
vser->bus.vser = vser;
QTAILQ_INIT(&vser->ports);
@@ -961,7 +963,7 @@ static int virtio_serial_device_init(VirtIODevice *vdev)
* Register for the savevm section with the virtio-console name
* to preserve backward compat
*/
- register_savevm(qdev, "virtio-console", -1, 3, virtio_serial_save,
+ register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save,
virtio_serial_load, vser);
return 0;
--
1.8.4.2
- [Qemu-devel] [PULL 06/30] virtio-blk: switch exit callback to VirtioDeviceClass, (continued)
- [Qemu-devel] [PULL 06/30] virtio-blk: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 07/30] virtio-serial: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 08/30] virtio-net: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 09/30] virtio-scsi: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 10/30] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 11/30] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 12/30] virtio-pci: add device_unplugged callback, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 13/30] virtio-blk-dataplane: Improve error reporting, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 14/30] virtio-9p: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 15/30] virtio-blk: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 16/30] virtio-serial: QOM realize preparations,
Paolo Bonzini <=
- [Qemu-devel] [PULL 17/30] virtio-net: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 18/30] virtio-balloon: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 19/30] virtio-rng: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 20/30] virtio-scsi: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 21/30] virtio: Start converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 22/30] virtio-9p: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 23/30] virtio-blk: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 24/30] virtio-serial: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 25/30] virtio-net: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 26/30] virtio-balloon: Convert to QOM realize, Paolo Bonzini, 2013/12/09