[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 3/7] virtio-serial-s390: switch to the new API.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH v6 3/7] virtio-serial-s390: switch to the new API. |
Date: |
Tue, 9 Apr 2013 14:53:32 +0200 |
From: KONRAD Frederic <address@hidden>
Here the virtio-serial-s390 is modified for the new API. The device
virtio-serial-s390 extends virtio-s390-device as before. It creates and
connects a virtio-serial during the init. The properties are not
modified.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 30 ++++++++++++++++++++----------
hw/s390x/s390-virtio-bus.h | 12 +++++++++++-
2 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 6d857b9..a71c145 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -181,27 +181,36 @@ static void s390_virtio_blk_instance_init(Object *obj)
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
}
-static int s390_virtio_serial_init(VirtIOS390Device *dev)
+static int s390_virtio_serial_init(VirtIOS390Device *s390_dev)
{
+ VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(s390_dev);
+ DeviceState *vdev = DEVICE(&dev->vdev);
+ DeviceState *qdev = DEVICE(s390_dev);
VirtIOS390Bus *bus;
- VirtIODevice *vdev;
int r;
- bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus);
+ bus = DO_UPCAST(VirtIOS390Bus, bus, qdev->parent_bus);
- vdev = virtio_serial_init((DeviceState *)dev, &dev->serial);
- if (!vdev) {
+ qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
+ if (qdev_init(vdev) < 0) {
return -1;
}
- r = s390_virtio_device_init(dev, vdev);
+ r = s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
if (!r) {
- bus->console = dev;
+ bus->console = s390_dev;
}
return r;
}
+static void s390_virtio_serial_instance_init(Object *obj)
+{
+ VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(obj);
+ object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL);
+ object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
+}
+
static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev)
{
VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(s390_dev);
@@ -465,7 +474,7 @@ static const TypeInfo s390_virtio_blk = {
};
static Property s390_virtio_serial_properties[] = {
- DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOS390Device, serial),
+ DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOSerialS390, vdev.serial),
DEFINE_PROP_END_OF_LIST(),
};
@@ -479,9 +488,10 @@ static void s390_virtio_serial_class_init(ObjectClass
*klass, void *data)
}
static const TypeInfo s390_virtio_serial = {
- .name = "virtio-serial-s390",
+ .name = TYPE_VIRTIO_SERIAL_S390,
.parent = TYPE_VIRTIO_S390_DEVICE,
- .instance_size = sizeof(VirtIOS390Device),
+ .instance_size = sizeof(VirtIOSerialS390),
+ .instance_init = s390_virtio_serial_instance_init,
.class_init = s390_virtio_serial_class_init,
};
diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h
index c557132..1daf753 100644
--- a/hw/s390x/s390-virtio-bus.h
+++ b/hw/s390x/s390-virtio-bus.h
@@ -91,7 +91,6 @@ struct VirtIOS390Device {
VirtIODevice *vdev;
NICConf nic;
uint32_t host_features;
- virtio_serial_conf serial;
virtio_net_conf net;
VirtIORNGConf rng;
VirtioBusState bus;
@@ -141,4 +140,15 @@ typedef struct VirtIOSCSIS390 {
VirtIOSCSI vdev;
} VirtIOSCSIS390;
+/* virtio-serial-s390 */
+
+#define TYPE_VIRTIO_SERIAL_S390 "virtio-serial-s390"
+#define VIRTIO_SERIAL_S390(obj) \
+ OBJECT_CHECK(VirtIOSerialS390, (obj), TYPE_VIRTIO_SERIAL_S390)
+
+typedef struct VirtIOSerialS390 {
+ VirtIOS390Device parent_obj;
+ VirtIOSerial vdev;
+} VirtIOSerialS390;
+
#endif
--
1.8.1.4
- [Qemu-devel] [PATCH v6 0/7] virtio-serial refactoring., fred . konrad, 2013/04/09
- [Qemu-devel] [PATCH v6 2/7] virtio-serial-pci: switch to the new API., fred . konrad, 2013/04/09
- [Qemu-devel] [PATCH v6 4/7] virtio-serial-ccw: switch to the new API., fred . konrad, 2013/04/09
- [Qemu-devel] [PATCH v6 1/7] virtio-serial: add the virtio-serial device., fred . konrad, 2013/04/09
- [Qemu-devel] [PATCH v6 5/7] virtio-serial: cleanup: init and exit functions., fred . konrad, 2013/04/09
- [Qemu-devel] [PATCH v6 3/7] virtio-serial-s390: switch to the new API.,
fred . konrad <=
- [Qemu-devel] [PATCH v6 7/7] virtio-serial: cleanup: remove qdev field., fred . konrad, 2013/04/09
- [Qemu-devel] [PATCH v6 6/7] virtio-serial: cleanup: use QOM casts., fred . konrad, 2013/04/09
- Re: [Qemu-devel] [PATCH v6 0/7] virtio-serial refactoring., Peter Maydell, 2013/04/09
- Re: [Qemu-devel] [PATCH v6 0/7] virtio-serial refactoring., Amit Shah, 2013/04/10
- Re: [Qemu-devel] [PATCH v6 0/7] virtio-serial refactoring., Anthony Liguori, 2013/04/15