From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHeK-0004yP-N3 for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHeJ-0005rt-KL for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:16 -0500 Received: from greensocs.com ([87.106.252.221]:52876 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHeJ-0005rm-Ak for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:15 -0500 From: fred.konrad@greensocs.com Date: Mon, 7 Jan 2013 19:40:41 +0100 Message-Id: <1357584074-10852-29-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> References: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [PATCH 28/61] virtio-scsi-s390 : switch to the new API. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, aliguori@us.ibm.com Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com From: KONRAD Frederic 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 --- hw/s390-virtio-bus.c | 26 +++++++++++++++++--------- hw/s390-virtio-bus.h | 13 ++++++++++++- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 283b7b6..569cac2 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -210,16 +210,23 @@ 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; - - vdev = virtio_scsi_init((DeviceState *)dev, &dev->scsi); - if (!vdev) { + VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(s390_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + virtio_scsi_set_conf(vdev, &(dev->scsi)); + qdev_set_parent_bus(vdev, BUS(s390_dev->bus)); + if (qdev_init(vdev) < 0) { return -1; } + return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); +} - return s390_virtio_device_init(dev, 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 +550,7 @@ static TypeInfo virtio_s390_device_info = { }; static Property s390_virtio_scsi_properties[] = { - DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOS390Device, scsi), + DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSIS390, scsi), DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features), DEFINE_PROP_BIT("hotplug", VirtIOS390Device, host_features, VIRTIO_SCSI_F_HOTPLUG, true), @@ -562,9 +569,10 @@ static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data) } static 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/s390-virtio-bus.h b/hw/s390-virtio-bus.h index f67ca51..62c2b1c 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -87,7 +87,6 @@ struct VirtIOS390Device { VirtIODevice *vdev; uint32_t host_features; virtio_serial_conf serial; - VirtIOSCSIConf scsi; VirtIORNGConf rng; VirtioBusState *bus; }; @@ -138,5 +137,17 @@ typedef struct VirtIONetS390 { NICConf nic; } VirtIONetS390; +/* 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; + VirtIOSCSIConf scsi; +} VirtIOSCSIS390; + #endif -- 1.7.11.7