From patchwork Tue Mar 12 13:02:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 227020 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 0DD1C2C008C for ; Wed, 13 Mar 2013 00:03:44 +1100 (EST) Received: from localhost ([::1]:53759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFOrm-0007K4-7P for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2013 09:03:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFOrM-00076v-5P for qemu-devel@nongnu.org; Tue, 12 Mar 2013 09:03:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFOrG-0001e9-9r for qemu-devel@nongnu.org; Tue, 12 Mar 2013 09:03:16 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:37877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFOrG-0001du-20 for qemu-devel@nongnu.org; Tue, 12 Mar 2013 09:03:10 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Mar 2013 12:59:28 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Mar 2013 12:59:15 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id CF16117D8057 for ; Tue, 12 Mar 2013 13:03:28 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2CD2eH031522970 for ; Tue, 12 Mar 2013 13:02:40 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2CD2mR7016688 for ; Tue, 12 Mar 2013 07:02:49 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-122.boeblingen.de.ibm.com [9.152.224.122]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2CD2lDp016601; Tue, 12 Mar 2013 07:02:48 -0600 From: Cornelia Huck To: qemu-devel Date: Tue, 12 Mar 2013 14:02:47 +0100 Message-Id: <1363093367-506-3-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363093367-506-1-git-send-email-cornelia.huck@de.ibm.com> References: <1363093367-506-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031212-1948-0000-0000-00000487A96B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.110 Cc: Blue Swirl , Anthony Liguori , =?UTF-8?q?Aur=C3=A9lien=20Jarno?= Subject: [Qemu-devel] [PATCH 2/2] virtio-ccw: Wire up virtio-rng. 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 Make virtio-rng devices available for s390-ccw-virtio machines. Signed-off-by: Cornelia Huck --- hw/s390x/virtio-ccw.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/s390x/virtio-ccw.h | 2 ++ 2 files changed, 62 insertions(+) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 06b9641..d4361f6 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -642,6 +642,30 @@ static int virtio_ccw_scsi_exit(VirtioCcwDevice *dev) return virtio_ccw_exit(dev); } +static int virtio_ccw_rng_init(VirtioCcwDevice *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) { + 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); +} + /* DeviceState to VirtioCcwDevice. Note: used on datapath, * be careful and test performance if you change this. */ @@ -831,6 +855,41 @@ static const TypeInfo virtio_ccw_scsi = { .class_init = virtio_ccw_scsi_class_init, }; +static void virtio_ccw_rng_initfn(Object *obj) +{ + VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(obj); + + object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, + (Object **)&dev->rng.rng, NULL); +} + +static Property virtio_ccw_rng_properties[] = { + DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), + DEFINE_VIRTIO_COMMON_FEATURES(VirtioCcwDevice, host_features[0]), + DEFINE_PROP_UINT64("max-bytes", VirtioCcwDevice, rng.max_bytes, INT64_MAX), + DEFINE_PROP_UINT32("period", VirtioCcwDevice, rng.period_ms, 1 << 16), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); + + k->init = virtio_ccw_rng_init; + k->exit = virtio_ccw_rng_exit; + dc->reset = virtio_ccw_reset; + dc->props = virtio_ccw_rng_properties; +} + +static const TypeInfo virtio_ccw_rng = { + .name = "virtio-rng-ccw", + .parent = TYPE_VIRTIO_CCW_DEVICE, + .instance_size = sizeof(VirtioCcwDevice), + .instance_init = virtio_ccw_rng_initfn, + .class_init = virtio_ccw_rng_class_init, +}; + static int virtio_ccw_busdev_init(DeviceState *dev) { VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev; @@ -953,6 +1012,7 @@ static void virtio_ccw_register(void) type_register_static(&virtio_ccw_net); type_register_static(&virtio_ccw_balloon); type_register_static(&virtio_ccw_scsi); + type_register_static(&virtio_ccw_rng); type_register_static(&virtual_css_bridge_info); } diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 48474b3..88c46c0 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #define VIRTUAL_CSSID 0xfe @@ -77,6 +78,7 @@ struct VirtioCcwDevice { virtio_serial_conf serial; virtio_net_conf net; VirtIOSCSIConf scsi; + VirtIORNGConf rng; VirtioBusState bus; /* Guest provided values: */ hwaddr indicators;