From patchwork Tue Jan 15 14:09:51 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: 212201 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 08A2D2C00A2 for ; Wed, 16 Jan 2013 01:52:50 +1100 (EST) Received: from localhost ([::1]:39917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7se-0002qc-7p for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:52:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7sW-0002pX-SI for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:52:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7ER-0001QO-2L for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:13:01 -0500 Received: from greensocs.com ([87.106.252.221]:60573 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7EQ-0001Q1-M2 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:11:14 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id EF5AC440FE0; Tue, 15 Jan 2013 14:11:12 +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 yvtNehR-ND6Z; Tue, 15 Jan 2013 15:11:12 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 3A57D440FD4; Tue, 15 Jan 2013 15:11:07 +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 4A966440FC9; Tue, 15 Jan 2013 15:11:06 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 15 Jan 2013 15:09:51 +0100 Message-Id: <1358258998-6504-38-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> References: <1358258998-6504-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: 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, deepakcs@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH V3 37/44] virtio-serial-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-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 --- hw/s390-virtio-bus.c | 31 +++++++++++++++++++++---------- hw/s390-virtio-bus.h | 10 +++++++++- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 0610594..d7fd684 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -189,27 +189,37 @@ 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) { + virtio_serial_set_conf(vdev, &(dev->serial)); + 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); @@ -486,7 +496,7 @@ static const TypeInfo s390_virtio_blk = { }; static Property s390_virtio_serial_properties[] = { - DEFINE_PROP_UINT32("max_ports", VirtIOS390Device, + DEFINE_PROP_UINT32("max_ports", VirtIOSerialS390, serial.max_virtserial_ports, 31), DEFINE_PROP_END_OF_LIST(), }; @@ -501,9 +511,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/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 1efef2e..58d34bd 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -90,7 +90,6 @@ struct VirtIOS390Device { uint8_t feat_len; VirtIODevice *vdev; uint32_t host_features; - virtio_serial_conf serial; VirtioBusState bus; }; @@ -164,5 +163,14 @@ typedef struct VirtIORNGS390 { VirtIORNGConf rng; } VirtIORNGS390; +#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; + virtio_serial_conf serial; +} VirtIOSerialS390; #endif