diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2019-08-20 18:06:15 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-09-04 06:32:51 -0400 |
| commit | 0198c2621a1e57d4ceaca1326897f007963c12df (patch) | |
| tree | f00b21625f7f9d98b6b43f80cd61664fcbb4cfbb | |
| parent | 5f7655f6ef1583c4b15c5a6e1aa2348538f6104b (diff) | |
virtio-rng: change default backend to rng-builtin
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20190820160615.14616-4-lvivier@redhat.com>
| -rw-r--r-- | backends/rng-builtin.c | 1 | ||||
| -rw-r--r-- | hw/virtio/virtio-rng.c | 3 | ||||
| -rw-r--r-- | include/sysemu/rng.h | 2 | ||||
| -rw-r--r-- | qemu-options.hx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/backends/rng-builtin.c b/backends/rng-builtin.c index 3381d47174..ba1b8d66b8 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 fcf3b2e329..e93bed020f 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -19,7 +19,6 @@ #include "hw/virtio/virtio-rng.h" #include "sysemu/rng.h" #include "sysemu/runstate.h" -#include "sysemu/rng-random.h" #include "qom/object_interfaces.h" #include "trace.h" @@ -193,7 +192,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 9b22c156f8..fa6eada78c 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 a8b70d946f..b2ba7c501d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4337,7 +4337,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} |