[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/10] virtio-scsi-s390: switch to the new API.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH v4 06/10] virtio-scsi-s390: switch to the new API. |
Date: |
Wed, 20 Mar 2013 15:07:39 +0100 |
From: KONRAD Frederic <address@hidden>
Here the virtio-scsi-s390 is modified for the new API. The device
virtio-scsi-s390 extends virtio-s390-device as before. It creates and
connects a virtio-scsi during the init. The properties are not modified.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 25 +++++++++++++++++--------
hw/s390x/s390-virtio-bus.h | 11 ++++++++++-
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 265d94f..a724090 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -202,16 +202,24 @@ static int s390_virtio_serial_init(VirtIOS390Device *dev)
return r;
}
-static int s390_virtio_scsi_init(VirtIOS390Device *dev)
+static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev)
{
- VirtIODevice *vdev;
+ VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(s390_dev);
+ DeviceState *vdev = DEVICE(&dev->vdev);
- vdev = virtio_scsi_init((DeviceState *)dev, &dev->scsi);
- if (!vdev) {
+ qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
+ if (qdev_init(vdev) < 0) {
return -1;
}
- return s390_virtio_device_init(dev, vdev);
+ return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
+}
+
+static void s390_virtio_scsi_instance_init(Object *obj)
+{
+ VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(obj);
+ object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SCSI);
+ object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
}
static int s390_virtio_rng_init(VirtIOS390Device *dev)
@@ -543,7 +551,7 @@ static const TypeInfo virtio_s390_device_info = {
};
static Property s390_virtio_scsi_properties[] = {
- DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOS390Device, scsi),
+ DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSIS390, vdev.conf),
DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),
DEFINE_PROP_BIT("hotplug", VirtIOS390Device, host_features,
VIRTIO_SCSI_F_HOTPLUG, true),
@@ -562,9 +570,10 @@ static void s390_virtio_scsi_class_init(ObjectClass
*klass, void *data)
}
static const TypeInfo s390_virtio_scsi = {
- .name = "virtio-scsi-s390",
+ .name = TYPE_VIRTIO_SCSI_S390,
.parent = TYPE_VIRTIO_S390_DEVICE,
- .instance_size = sizeof(VirtIOS390Device),
+ .instance_size = sizeof(VirtIOSCSIS390),
+ .instance_init = s390_virtio_scsi_instance_init,
.class_init = s390_virtio_scsi_class_init,
};
diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h
index 1a63411..ebe8794 100644
--- a/hw/s390x/s390-virtio-bus.h
+++ b/hw/s390x/s390-virtio-bus.h
@@ -93,7 +93,6 @@ struct VirtIOS390Device {
uint32_t host_features;
virtio_serial_conf serial;
virtio_net_conf net;
- VirtIOSCSIConf scsi;
VirtIORNGConf rng;
VirtioBusState bus;
};
@@ -131,5 +130,15 @@ typedef struct VirtIOBlkS390 {
VirtIOBlkConf blk;
} VirtIOBlkS390;
+/* virtio-scsi-s390 */
+
+#define TYPE_VIRTIO_SCSI_S390 "virtio-scsi-s390"
+#define VIRTIO_SCSI_S390(obj) \
+ OBJECT_CHECK(VirtIOSCSIS390, (obj), TYPE_VIRTIO_SCSI_S390)
+
+typedef struct VirtIOSCSIS390 {
+ VirtIOS390Device parent_obj;
+ VirtIOSCSI vdev;
+} VirtIOSCSIS390;
#endif
--
1.7.11.7
- [Qemu-devel] [PATCH v4 00/10] virtio-scsi refactoring., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 01/10] virtio-scsi: don't use pointer for configuration., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 02/10] virtio-scsi: allocate cmd_vqs array separately., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 03/10] virtio-scsi: moving host_features from properties to transport properties., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 06/10] virtio-scsi-s390: switch to the new API.,
fred . konrad <=
- [Qemu-devel] [PATCH v4 05/10] virtio-scsi-pci: switch to new API., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 07/10] virtio-scsi-ccw: switch to new API, fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 04/10] virtio-scsi: add the virtio-scsi device., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 09/10] virtio-scsi: cleanup: init and exit functions., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 08/10] virtio-scsi: cleanup: use QOM casts., fred . konrad, 2013/03/20
- [Qemu-devel] [PATCH v4 10/10] virtio-scsi: cleanup: remove qdev field., fred . konrad, 2013/03/20
- Re: [Qemu-devel] [PATCH v4 00/10] virtio-scsi refactoring., Cornelia Huck, 2013/03/20