diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-05 16:16:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-05 16:16:15 +0100 |
| commit | d2c5f91ca944aaade642624397e1853801bbc744 (patch) | |
| tree | f3fcf77f22a47ed14250cf90e3512eaa850b497e | |
| parent | dba519a2980ab4ba2b3f89546f382de7199eabb6 (diff) | |
| parent | 2cd925dac80d708d01f124b26de52fb447a333aa (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
Fix typo, change virtio-rng default to urandom
# gpg: Signature made Wed 03 Jul 2019 16:24:53 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
docs/devel/testing: Fix typo in dockerfile path
VirtIO-RNG: Update default entropy source to `/dev/urandom`
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | backends/rng-random.c | 2 | ||||
| -rw-r--r-- | docs/devel/testing.rst | 2 | ||||
| -rw-r--r-- | qemu-options.hx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/backends/rng-random.c b/backends/rng-random.c index aa5b9285f0..a810581393 100644 --- a/backends/rng-random.c +++ b/backends/rng-random.c @@ -113,7 +113,7 @@ static void rng_random_init(Object *obj) rng_random_set_filename, NULL); - s->filename = g_strdup("/dev/random"); + s->filename = g_strdup("/dev/urandom"); s->fd = -1; } diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 68aba3926e..bf75675fb0 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -327,7 +327,7 @@ Images ------ Along with many other images, the ``min-glib`` image is defined in a Dockerfile -in ``tests/docker/dockefiles/``, called ``min-glib.docker``. ``make docker`` +in ``tests/docker/dockerfiles/``, called ``min-glib.docker``. ``make docker`` command will list all the available images. To add a new image, simply create a new ``.docker`` file under the diff --git a/qemu-options.hx b/qemu-options.hx index c18b79099a..af850923f7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4328,7 +4328,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/random}. +entropy from and if omitted defaults to @option{/dev/urandom}. @item -object rng-egd,id=@var{id},chardev=@var{chardevid} |