From patchwork Fri Apr 19 13:57:32 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: 237959 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 1DD872C013F for ; Fri, 19 Apr 2013 23:58:59 +1000 (EST) Received: from localhost ([::1]:48724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBq5-0004L4-DB for incoming@patchwork.ozlabs.org; Fri, 19 Apr 2013 09:58:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBpD-0003iH-08 for qemu-devel@nongnu.org; Fri, 19 Apr 2013 09:58:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTBpB-0002UU-Kr for qemu-devel@nongnu.org; Fri, 19 Apr 2013 09:58:02 -0400 Received: from greensocs.com ([87.106.252.221]:47566 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBpB-0002UA-CH for qemu-devel@nongnu.org; Fri, 19 Apr 2013 09:58:01 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id C159140EC68; Fri, 19 Apr 2013 13:58: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 uDTzqhEyPHuO; Fri, 19 Apr 2013 15:57:58 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 93F4240EC63; Fri, 19 Apr 2013 15:57:58 +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 B1C3740EC69; Fri, 19 Apr 2013 15:57:57 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Fri, 19 Apr 2013 15:57:32 +0200 Message-Id: <1366379855-28649-6-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1366379855-28649-1-git-send-email-fred.konrad@greensocs.com> References: <1366379855-28649-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: peter.maydell@linaro.org, mark.burton@greensocs.com, Alexander Graf , cornelia.huck@de.ibm.com, fred.konrad@greensocs.com, Richard Henderson Subject: [Qemu-devel] [PATCH v4 5/8] virtio-rng-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-rng-ccw is modified for the new API. The device virtio-rng-pci extends virtio-pci. It creates and connects a virtio-rng-device during the init. The properties are not changed. Signed-off-by: KONRAD Frederic --- hw/s390x/virtio-ccw.c | 48 +++++++++++++++++++++--------------------------- hw/s390x/virtio-ccw.h | 12 +++++++++++- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index f3c1ea4..65d960b 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -687,28 +687,21 @@ static void virtio_ccw_scsi_instance_init(Object *obj) object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } -static int virtio_ccw_rng_init(VirtioCcwDevice *dev) +static int virtio_ccw_rng_init(VirtioCcwDevice *ccw_dev) { - VirtIODevice *vdev; - - if (dev->rng.rng == NULL) { - dev->rng.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); - object_property_add_child(OBJECT(dev), "default-backend", - OBJECT(dev->rng.default_backend), NULL); - object_property_set_link(OBJECT(dev), OBJECT(dev->rng.default_backend), - "rng", NULL); - } - vdev = virtio_rng_init((DeviceState *)dev, &dev->rng); - if (!vdev) { + VirtIORNGCcw *dev = VIRTIO_RNG_CCW(ccw_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + + qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); + if (qdev_init(vdev) < 0) { return -1; } - return virtio_ccw_device_init(dev, vdev); -} -static int virtio_ccw_rng_exit(VirtioCcwDevice *dev) -{ - virtio_rng_exit(dev->vdev); - return virtio_ccw_exit(dev); + object_property_set_link(OBJECT(dev), + OBJECT(dev->vdev.conf.default_backend), "rng", + NULL); + + return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev)); } /* DeviceState to VirtioCcwDevice. Note: used on datapath, @@ -897,18 +890,19 @@ static const TypeInfo virtio_ccw_scsi = { .class_init = virtio_ccw_scsi_class_init, }; -static void virtio_ccw_rng_initfn(Object *obj) +static void virtio_ccw_rng_instance_init(Object *obj) { - VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(obj); - + VirtIORNGCcw *dev = VIRTIO_RNG_CCW(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_RNG); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, - (Object **)&dev->rng.rng, NULL); + (Object **)&dev->vdev.conf.rng, NULL); } static Property virtio_ccw_rng_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_VIRTIO_COMMON_FEATURES(VirtioCcwDevice, host_features[0]), - DEFINE_VIRTIO_RNG_PROPERTIES(VirtioCcwDevice, rng), + DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGCcw, vdev.conf), DEFINE_PROP_END_OF_LIST(), }; @@ -918,16 +912,16 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data) VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); k->init = virtio_ccw_rng_init; - k->exit = virtio_ccw_rng_exit; + k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_rng_properties; } static const TypeInfo virtio_ccw_rng = { - .name = "virtio-rng-ccw", + .name = TYPE_VIRTIO_RNG_CCW, .parent = TYPE_VIRTIO_CCW_DEVICE, - .instance_size = sizeof(VirtioCcwDevice), - .instance_init = virtio_ccw_rng_initfn, + .instance_size = sizeof(VirtIORNGCcw), + .instance_init = virtio_ccw_rng_instance_init, .class_init = virtio_ccw_rng_class_init, }; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 35ab1a5..fea9208 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -74,7 +74,6 @@ struct VirtioCcwDevice { VirtIODevice *vdev; char *bus_id; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; - VirtIORNGConf rng; VirtioBusState bus; /* Guest provided values: */ hwaddr indicators; @@ -146,6 +145,17 @@ typedef struct VirtIONetCcw { VirtIONet vdev; } VirtIONetCcw; +/* virtio-rng-ccw */ + +#define TYPE_VIRTIO_RNG_CCW "virtio-rng-ccw" +#define VIRTIO_RNG_CCW(obj) \ + OBJECT_CHECK(VirtIORNGCcw, (obj), TYPE_VIRTIO_RNG_CCW) + +typedef struct VirtIORNGCcw { + VirtioCcwDevice parent_obj; + VirtIORNG vdev; +} VirtIORNGCcw; + VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);