From patchwork Tue May 21 14:11:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1102817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 457dBP45HYz9s6w for ; Wed, 22 May 2019 00:17:17 +1000 (AEST) Received: from localhost ([127.0.0.1]:54590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT5Zr-000834-GV for incoming@patchwork.ozlabs.org; Tue, 21 May 2019 10:17:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT5Uj-0005CU-Ai for qemu-devel@nongnu.org; Tue, 21 May 2019 10:11:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hT5Uh-0000m2-HP for qemu-devel@nongnu.org; Tue, 21 May 2019 10:11:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hT5Uh-0000lC-CD for qemu-devel@nongnu.org; Tue, 21 May 2019 10:11:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80E46C130719; Tue, 21 May 2019 14:11:53 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.40.205.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 015425E7AF; Tue, 21 May 2019 14:11:50 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 21 May 2019 16:11:33 +0200 Message-Id: <20190521141133.27380-5-lvivier@redhat.com> In-Reply-To: <20190521141133.27380-1-lvivier@redhat.com> References: <20190521141133.27380-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 21 May 2019 14:11:53 +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 v6 4/4] 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?b?w6k=?= , Amit Shah , "Michael S. Tsirkin" , Richard Henderson , Markus Armbruster , "Richard W . M . Jones" , Kashyap Chamarthy Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Markus Armbruster Signed-off-by: Laurent Vivier --- backends/rng-builtin.c | 1 - hw/virtio/virtio-rng.c | 3 +-- include/sysemu/rng.h | 2 ++ qemu-options.hx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends/rng-builtin.c b/backends/rng-builtin.c index 6b9543a7de87..868055cbc723 100644 --- a/backends/rng-builtin.c +++ b/backends/rng-builtin.c @@ -10,7 +10,6 @@ #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 { diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 73ffb476e030..55745f75a1c9 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -16,7 +16,6 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-rng.h" #include "sysemu/rng.h" -#include "sysemu/rng-random.h" #include "qom/object_interfaces.h" #include "trace.h" @@ -190,7 +189,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) } if (vrng->conf.rng == NULL) { - Object *default_backend = object_new(TYPE_RNG_RANDOM); + Object *default_backend = object_new(TYPE_RNG_BUILTIN); user_creatable_complete(USER_CREATABLE(default_backend), &local_err); diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h index 27b37da05d2e..9dc5e0e90100 100644 --- a/include/sysemu/rng.h +++ b/include/sysemu/rng.h @@ -24,6 +24,8 @@ #define RNG_BACKEND_CLASS(klass) \ OBJECT_CLASS_CHECK(RngBackendClass, (klass), TYPE_RNG_BACKEND) +#define TYPE_RNG_BUILTIN "rng-builtin" + typedef struct RngRequest RngRequest; typedef struct RngBackendClass RngBackendClass; typedef struct RngBackend RngBackend; diff --git a/qemu-options.hx b/qemu-options.hx index d5233e189ceb..cd1c68d8dc9a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4325,7 +4325,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}