From patchwork Thu Mar 21 14:15:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 229696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2E532C00CB for ; Fri, 22 Mar 2013 01:16:58 +1100 (EST) Received: from localhost ([::1]:38051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgIX-0003KG-L9 for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2013 10:16:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgHu-00035h-SJ for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:16:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIgHg-0000gk-9c for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:16:09 -0400 Received: from greensocs.com ([87.106.252.221]:54630 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgHf-0000eo-UK for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:16:00 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id B997E43EE3A; Thu, 21 Mar 2013 14:15:50 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LoXAET8PodUH; Thu, 21 Mar 2013 15:15:48 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 5720844D682; Thu, 21 Mar 2013 15:15:39 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 673C743EE31; Thu, 21 Mar 2013 15:15:38 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Thu, 21 Mar 2013 15:15:16 +0100 Message-Id: <1363875320-7985-7-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1363875320-7985-1-git-send-email-fred.konrad@greensocs.com> References: <1363875320-7985-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, mark.burton@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v5 06/10] virtio-scsi-s390: switch to the new API. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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/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 68db7b9..2dd1c63 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_SCSI_FEATURES(VirtIOS390Device, host_features), DEFINE_PROP_END_OF_LIST(), }; @@ -558,9 +566,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