From nobody Mon Feb 9 21:38:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557820707; cv=none; d=zoho.com; s=zohoarc; b=YgaPMe3JoK12GqtaFR4+YKcB7fn4iMsCembwm870wlqz/S4c2DSE9ffDcp9VvwUF8mpdyXfVoFaT6YSm1YckZsuXFYRzi7M6E8jR7EkkXR6c/mkv+ZayUi9VBn+mpsV/aCbCtg9uJRLDogGgCMzlsjuFqm2xeuSyJvrvF8egxIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557820707; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=iKiofmwOcgrtKruqnKc2CfAd+nMi3l0FQja/d7FJhWM=; b=fAWj5Pv7YaHzxLu7ZQIBg0ZU6tbSkxo4eolI5qVXqwJVppKSgp3bRJoMuxEtuj+1iSx4JqIqBTQtrCMAv5KTaNNYAG4m5XSE5z1NHh/bjpRgU/LLJTXPzv68rFfgGza/5NCFfkMPUBWceWX0k15l4tartWPFRrPb3ew/mAiBxNo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557820707526509.5528487603749; Tue, 14 May 2019 00:58:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:41428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQSKQ-0002lk-4w for importer@patchew.org; Tue, 14 May 2019 03:58:26 -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) Content-Transfer-Encoding: quoted-printable 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=20P=20=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , "Michael S. Tsirkin" , Richard Henderson , Markus Armbruster , Amit Shah , "Richard W . M . Jones" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 @@ =20 #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" =20 -#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; +}; =20 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) } =20 if (vrng->conf.rng =3D=3D NULL) { - vrng->conf.default_backend =3D RNG_RANDOM(object_new(TYPE_RNG_RAND= OM)); + vrng->conf.default_backend =3D RNG_BUILTIN(object_new(TYPE_RNG_BUI= LTIN)); =20 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 =20 #include "sysemu/rng.h" -#include "sysemu/rng-random.h" +#include "sysemu/rng-builtin.h" #include "standard-headers/linux/virtio_rng.h" =20 #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; }; =20 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 late= r. + * 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 defa= ult 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. =20 @item -object rng-random,id=3D@var{id},filename=3D@var{/dev/random} =20 @@ -4293,8 +4293,7 @@ Creates a random number generator backend which obtai= ns 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}. =20 @item -object rng-egd,id=3D@var{id},chardev=3D@var{chardevid} =20 --=20 2.20.1