From patchwork Tue May 14 07:56:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10942425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD5FB912 for ; Tue, 14 May 2019 07:57:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D17DB28569 for ; Tue, 14 May 2019 07:57:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C55282861E; Tue, 14 May 2019 07:57:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5824B28569 for ; Tue, 14 May 2019 07:57:52 +0000 (UTC) Received: from localhost ([127.0.0.1]:41428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSJr-0002lk-Ke for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 May 2019 03:57:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSIU-0001NV-00 for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQSIS-0004G0-RU for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQSIS-0004FX-KO for qemu-devel@nongnu.org; Tue, 14 May 2019 03:56:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E836A308AA12; Tue, 14 May 2019 07:56:23 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.40.205.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 900C364448; Tue, 14 May 2019 07:56:18 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 09:56:02 +0200 Message-Id: <20190514075602.7674-4-lvivier@redhat.com> In-Reply-To: <20190514075602.7674-1-lvivier@redhat.com> References: <20190514075602.7674-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 14 May 2019 07:56:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 3/3] virtio-rng: change default backend to rng-builtin X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , Kashyap Chamarthy , "Michael S. Tsirkin" , Richard Henderson , Markus Armbruster , Amit Shah , "Richard W . M . Jones" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Laurent Vivier Reviewed-by: Markus Armbruster --- backends/rng-builtin.c | 8 +++----- hw/virtio/virtio-rng.c | 2 +- include/hw/virtio/virtio-rng.h | 4 ++-- include/sysemu/rng-builtin.h | 17 +++++++++++++++++ qemu-options.hx | 5 ++--- 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 include/sysemu/rng-builtin.h diff --git a/backends/rng-builtin.c b/backends/rng-builtin.c index b1264b745407..27675301933b 100644 --- a/backends/rng-builtin.c +++ b/backends/rng-builtin.c @@ -7,17 +7,15 @@ #include "qemu/osdep.h" #include "sysemu/rng.h" +#include "sysemu/rng-builtin.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" -#define TYPE_RNG_BUILTIN "rng-builtin" -#define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN) - -typedef struct RngBuiltin { +struct RngBuiltin { RngBackend parent; -} RngBuiltin; +}; static void rng_builtin_request_entropy(RngBackend *b, RngRequest *req) { diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 30493a258622..67209f63ddbc 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -189,7 +189,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) } if (vrng->conf.rng == NULL) { - vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); + vrng->conf.default_backend = RNG_BUILTIN(object_new(TYPE_RNG_BUILTIN)); user_creatable_complete(USER_CREATABLE(vrng->conf.default_backend), &local_err); diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 922dce7caccf..f9b6339b19a4 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -13,7 +13,7 @@ #define QEMU_VIRTIO_RNG_H #include "sysemu/rng.h" -#include "sysemu/rng-random.h" +#include "sysemu/rng-builtin.h" #include "standard-headers/linux/virtio_rng.h" #define TYPE_VIRTIO_RNG "virtio-rng-device" @@ -26,7 +26,7 @@ struct VirtIORNGConf { RngBackend *rng; uint64_t max_bytes; uint32_t period_ms; - RngRandom *default_backend; + RngBuiltin *default_backend; }; typedef struct VirtIORNG { diff --git a/include/sysemu/rng-builtin.h b/include/sysemu/rng-builtin.h new file mode 100644 index 000000000000..a0f75f97dde8 --- /dev/null +++ b/include/sysemu/rng-builtin.h @@ -0,0 +1,17 @@ +/* + * QEMU Builtin Random Number Generator Backend + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_RNG_BUILTIN_H +#define QEMU_RNG_BUILTIN_H + +#include "qom/object.h" + +#define TYPE_RNG_BUILTIN "rng-builtin" +#define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN) + +typedef struct RngBuiltin RngBuiltin; + +#endif diff --git a/qemu-options.hx b/qemu-options.hx index 6ab920f12be4..c9784be83cb5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4285,7 +4285,7 @@ The @option{share} boolean option is @var{on} by default with memfd. Creates a random number generator backend which obtains entropy from QEMU builtin functions. The @option{id} parameter is a unique ID that will be used to reference this entropy backend from the @option{virtio-rng} -device. +device. By default, the @option{virtio-rng} device uses this RNG backend. @item -object rng-random,id=@var{id},filename=@var{/dev/random} @@ -4293,8 +4293,7 @@ Creates a random number generator backend which obtains entropy from a device on the host. The @option{id} parameter is a unique ID that will be used to reference this entropy backend from the @option{virtio-rng} device. The @option{filename} parameter specifies which file to obtain -entropy from and if omitted defaults to @option{/dev/urandom}. By default, -the @option{virtio-rng} device uses this RNG backend. +entropy from and if omitted defaults to @option{/dev/urandom}. @item -object rng-egd,id=@var{id},chardev=@var{chardevid}