From patchwork Thu Mar 28 13:25:28 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: 232015 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 4E60B2C00BC for ; Fri, 29 Mar 2013 00:30:09 +1100 (EST) Received: from localhost ([::1]:52513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCu6-00017S-Si for incoming@patchwork.ozlabs.org; Thu, 28 Mar 2013 09:30:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCqC-0003fJ-HO for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:26:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULCq9-00086J-Mb for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:26:04 -0400 Received: from greensocs.com ([87.106.252.221]:39696 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCq9-00086A-6k for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:26:01 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id A0F5D43EE3F; Thu, 28 Mar 2013 13:26:00 +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 lF6uGhinoCqk; Thu, 28 Mar 2013 14:25:57 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 3534343EE3C; Thu, 28 Mar 2013 14:25:57 +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 681FD43EE38; Thu, 28 Mar 2013 14:25:56 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Thu, 28 Mar 2013 14:25:28 +0100 Message-Id: <1364477132-17968-4-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1364477132-17968-1-git-send-email-fred.konrad@greensocs.com> References: <1364477132-17968-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 v3 3/7] 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/s390x/s390-virtio-bus.c | 32 +++++++++++++++++++++----------- hw/s390x/s390-virtio-bus.h | 12 +++++++++++- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 8c529c1..68d0fcb 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,8 +474,8 @@ static const TypeInfo s390_virtio_blk = { }; static Property s390_virtio_serial_properties[] = { - DEFINE_PROP_UINT32("max_ports", VirtIOS390Device, - serial.max_virtserial_ports, 31), + DEFINE_PROP_UINT32("max_ports", VirtIOSerialS390, + vdev.serial.max_virtserial_ports, 31), DEFINE_PROP_END_OF_LIST(), }; @@ -480,9 +489,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 ebe8794..95610e0 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