[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 4/4] virtio-rng: change default backend to rng-bu
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v7 4/4] virtio-rng: change default backend to rng-builtin |
Date: |
Wed, 29 May 2019 16:31:06 +0200 |
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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 3381d47174df..ba1b8d66b83e 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 4e6a6828d7ce..7746fe9bed6a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4327,7 +4327,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,address@hidden,address@hidden/dev/random}
--
2.20.1