From patchwork Thu Apr 4 14:29:02 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: 233852 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 D27D92C00AC for ; Fri, 5 Apr 2013 01:31:52 +1100 (EST) Received: from localhost ([::1]:44367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNlCg-00076j-N8 for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 10:31:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNlAM-0003r4-Ap for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:29:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNlAH-0002C5-57 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:29:26 -0400 Received: from greensocs.com ([87.106.252.221]:45283 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNlAG-0002BN-JG for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:29:20 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 0E8AB456A64; Thu, 4 Apr 2013 14:29:20 +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 MeZmiNGMMVsA; Thu, 4 Apr 2013 16:29:17 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id A4C6B44D687; Thu, 4 Apr 2013 16:29:15 +0200 (CEST) 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 0009E40EC94; Thu, 4 Apr 2013 16:29:14 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Thu, 4 Apr 2013 16:29:02 +0200 Message-Id: <1365085745-14385-5-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1365085745-14385-1-git-send-email-fred.konrad@greensocs.com> References: <1365085745-14385-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 4/7] virtio-serial-ccw: 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-ccw is modified for the new API. The device virtio-serial-ccw extends virtio-ccw-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/virtio-ccw.c | 28 ++++++++++++++++------------ hw/s390x/virtio-ccw.h | 12 +++++++++++- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 3710905..e6977b8 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -590,22 +590,25 @@ static void virtio_ccw_blk_instance_init(Object *obj) object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } -static int virtio_ccw_serial_init(VirtioCcwDevice *dev) +static int virtio_ccw_serial_init(VirtioCcwDevice *ccw_dev) { - VirtIODevice *vdev; + VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(ccw_dev); + DeviceState *vdev = DEVICE(&dev->vdev); - vdev = virtio_serial_init((DeviceState *)dev, &dev->serial); - if (!vdev) { + qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); + if (qdev_init(vdev) < 0) { return -1; } - return virtio_ccw_device_init(dev, vdev); + return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev)); } -static int virtio_ccw_serial_exit(VirtioCcwDevice *dev) + +static void virtio_ccw_serial_instance_init(Object *obj) { - virtio_serial_exit(dev->vdev); - return virtio_ccw_exit(dev); + VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } static int virtio_ccw_balloon_init(VirtioCcwDevice *ccw_dev) @@ -786,7 +789,7 @@ static const TypeInfo virtio_ccw_blk = { static Property virtio_ccw_serial_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), - DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtioCcwDevice, serial), + DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtioSerialCcw, vdev.serial), DEFINE_VIRTIO_COMMON_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_PROP_END_OF_LIST(), }; @@ -797,15 +800,16 @@ static void virtio_ccw_serial_class_init(ObjectClass *klass, void *data) VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); k->init = virtio_ccw_serial_init; - k->exit = virtio_ccw_serial_exit; + k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_serial_properties; } static const TypeInfo virtio_ccw_serial = { - .name = "virtio-serial-ccw", + .name = TYPE_VIRTIO_SERIAL_CCW, .parent = TYPE_VIRTIO_CCW_DEVICE, - .instance_size = sizeof(VirtioCcwDevice), + .instance_size = sizeof(VirtioSerialCcw), + .instance_init = virtio_ccw_serial_instance_init, .class_init = virtio_ccw_serial_class_init, }; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index d580510..cebcbcd 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -75,7 +75,6 @@ struct VirtioCcwDevice { char *bus_id; NICConf nic; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; - virtio_serial_conf serial; virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; @@ -127,6 +126,17 @@ typedef struct VirtIOBalloonCcw { VirtIOBalloon vdev; } VirtIOBalloonCcw; +/* virtio-serial-ccw */ + +#define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw" +#define VIRTIO_SERIAL_CCW(obj) \ + OBJECT_CHECK(VirtioSerialCcw, (obj), TYPE_VIRTIO_SERIAL_CCW) + +typedef struct VirtioSerialCcw { + VirtioCcwDevice parent_obj; + VirtIOSerial vdev; +} VirtioSerialCcw; + VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);