[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next v2 11/22] virtio-serial: Convert to QOM rea
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next v2 11/22] virtio-serial: Convert to QOM realize |
Date: |
Thu, 1 Aug 2013 04:17:32 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/virtio-serial-bus.c | 25 ++++++++++++++-----------
include/hw/virtio/virtio-serial.h | 2 ++
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index a82786b..1bed93f 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -889,23 +889,26 @@ static int virtser_port_qdev_exit(DeviceState *qdev)
return 0;
}
-static int virtio_serial_device_init(VirtIODevice *vdev)
+static void virtio_serial_device_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(vdev);
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSerial *vser = VIRTIO_SERIAL(dev);
+ ObjectClass *parent_oc = VIRTIO_SERIAL_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
BusState *bus;
uint32_t i, max_supported_ports;
if (!vser->serial.max_virtserial_ports) {
- return -1;
+ error_setg(errp, "Maximum number of serial ports not specified");
+ return;
}
/* Each port takes 2 queues, and one pair is for the control queue */
max_supported_ports = VIRTIO_PCI_QUEUE_MAX / 2 - 1;
if (vser->serial.max_virtserial_ports > max_supported_ports) {
- error_report("maximum ports supported: %u", max_supported_ports);
- return -1;
+ error_setg(errp, "maximum ports supported: %u", max_supported_ports);
+ return;
}
virtio_init(vdev, "virtio-serial", VIRTIO_ID_CONSOLE,
@@ -966,7 +969,7 @@ static int virtio_serial_device_init(VirtIODevice *vdev)
register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save,
virtio_serial_load, vser);
- return 0;
+ parent_dc->realize(dev, errp);
}
static void virtio_serial_port_class_init(ObjectClass *klass, void *data)
@@ -989,10 +992,10 @@ static const TypeInfo virtio_serial_port_type_info = {
.class_init = virtio_serial_port_class_init,
};
-static int virtio_serial_device_exit(DeviceState *dev)
+static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
{
- VirtIOSerial *vser = VIRTIO_SERIAL(dev);
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ VirtIOSerial *vser = VIRTIO_SERIAL(dev);
unregister_savevm(dev, "virtio-console", vser);
@@ -1006,7 +1009,6 @@ static int virtio_serial_device_exit(DeviceState *dev)
g_free(vser->post_load);
}
virtio_cleanup(vdev);
- return 0;
}
static Property virtio_serial_properties[] = {
@@ -1018,10 +1020,11 @@ static void virtio_serial_class_init(ObjectClass
*klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
- dc->exit = virtio_serial_device_exit;
+
+ dc->realize = virtio_serial_device_realize;
+ dc->unrealize = virtio_serial_device_unrealize;
dc->props = virtio_serial_properties;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
- vdc->init = virtio_serial_device_init;
vdc->get_features = get_features;
vdc->get_config = get_config;
vdc->set_config = set_config;
diff --git a/include/hw/virtio/virtio-serial.h
b/include/hw/virtio/virtio-serial.h
index 1d2040b..9a94abd 100644
--- a/include/hw/virtio/virtio-serial.h
+++ b/include/hw/virtio/virtio-serial.h
@@ -247,6 +247,8 @@ void virtio_serial_throttle_port(VirtIOSerialPort *port,
bool throttle);
#define TYPE_VIRTIO_SERIAL "virtio-serial-device"
#define VIRTIO_SERIAL(obj) \
OBJECT_CHECK(VirtIOSerial, (obj), TYPE_VIRTIO_SERIAL)
+#define VIRTIO_SERIAL_GET_PARENT_CLASS(obj) \
+ OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_SERIAL)
#define DEFINE_VIRTIO_SERIAL_PROPERTIES(_state, _field) \
DEFINE_PROP_UINT32("max_ports", _state, _field.max_virtserial_ports,
31)
--
1.8.1.4
- [Qemu-devel] [PATCH for-next v2 03/22] virtio-9p-device: Avoid freeing uninitialized memory, (continued)
- [Qemu-devel] [PATCH for-next v2 03/22] virtio-9p-device: Avoid freeing uninitialized memory, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 01/22] object: Add OBJECT_GET_PARENT_CLASS() macro, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 05/22] virtio: Allow NULL VirtioDeviceClass::init hook, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 07/22] virtio-9p: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 08/22] virtio-blk: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 02/22] virtio-console: Use exitfn for virtserialport, too, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 06/22] virtio-9p: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 04/22] virtio-blk-dataplane: Improve error reporting, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 10/22] virtio-serial: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 09/22] virtio-blk: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 11/22] virtio-serial: Convert to QOM realize,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next v2 12/22] virtio-net: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 14/22] virtio-balloon: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 13/22] virtio-net: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 15/22] virtio-balloon: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 16/22] virtio-rng: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 17/22] virtio-rng: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 18/22] virtio-scsi: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 20/22] virtio: Convert VirtioDevice to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 21/22] virtio: Unrealize parent, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 19/22] virtio-scsi: Convert to QOM realize, Andreas Färber, 2013/07/31