qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [Qemu-devel] [PULL 17/25] aspeed/scu: Use qemu_guest_getrandom_nofail
Date: Wed, 22 May 2019 14:42:18 -0400	[thread overview]
Message-ID: <20190522184226.17871-18-richard.henderson@linaro.org> (raw)
In-Reply-To: <20190522184226.17871-1-richard.henderson@linaro.org>

The random number is intended for use by the guest.  As such, we should
honor the -seed argument for reproducibility.  Use the *_nofail routine
instead of rolling our own error handling locally.

Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 hw/misc/aspeed_scu.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c
index c8217740ef..ab1e18ed4b 100644
--- a/hw/misc/aspeed_scu.c
+++ b/hw/misc/aspeed_scu.c
@@ -16,7 +16,7 @@
 #include "qapi/visitor.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
-#include "crypto/random.h"
+#include "qemu/guest-random.h"
 #include "trace.h"
 
 #define TO_REG(offset) ((offset) >> 2)
@@ -157,14 +157,8 @@ static const uint32_t ast2500_a1_resets[ASPEED_SCU_NR_REGS] = {
 
 static uint32_t aspeed_scu_get_random(void)
 {
-    Error *err = NULL;
     uint32_t num;
-
-    if (qcrypto_random_bytes((uint8_t *)&num, sizeof(num), &err)) {
-        error_report_err(err);
-        exit(1);
-    }
-
+    qemu_guest_getrandom_nofail(&num, sizeof(num));
     return num;
 }
 
-- 
2.17.1



  parent reply	other threads:[~2019-05-22 19:22 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 18:42 [Qemu-devel] [PULL 00/25] Add qemu_getrandom and ARMv8.5-RNG etc Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 01/25] configure: Link test before auto-enabling crypto libraries Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 02/25] build: Link user-only with crypto random number objects Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 03/25] crypto: Reverse code blocks in random-platform.c Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 04/25] crypto: Do not fail for EINTR during qcrypto_random_bytes Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 05/25] crypto: Use O_CLOEXEC in qcrypto_random_init Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 06/25] crypto: Use getrandom for qcrypto_random_bytes Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 07/25] crypto: Change the qcrypto_random_bytes buffer type to void* Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 08/25] ui/vnc: Split out authentication_failed Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 09/25] ui/vnc: Use gcrypto_random_bytes for start_auth_vnc Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 10/25] util: Add qemu_guest_getrandom and associated routines Richard Henderson
2019-05-30 11:29   ` Peter Maydell
2019-05-30 13:41     ` Richard Henderson
2019-05-30 13:45       ` Peter Maydell
2019-05-22 18:42 ` [Qemu-devel] [PULL 11/25] cpus: Initialize pseudo-random seeds for all guest cpus Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 12/25] linux-user: " Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 13/25] linux-user: Call qcrypto_init if not using -seed Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 14/25] linux-user: Use qemu_guest_getrandom_nofail for AT_RANDOM Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 15/25] linux-user/aarch64: Use qemu_guest_getrandom for PAUTH keys Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 16/25] linux-user: Remove srand call Richard Henderson
2019-05-22 18:42 ` Richard Henderson [this message]
2019-05-22 18:42 ` [Qemu-devel] [PULL 18/25] hw/misc/nrf51_rng: Use qemu_guest_getrandom_nofail Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 19/25] hw/misc/bcm2835_rng: " Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 20/25] hw/misc/exynos4210_rng: Use qemu_guest_getrandom Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 21/25] target/arm: Put all PAC keys into a structure Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 22/25] target/arm: Implement ARMv8.5-RNG Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 23/25] target/ppc: Use gen_io_start/end around DARN Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 24/25] target/ppc: Use qemu_guest_getrandom for DARN Richard Henderson
2019-05-22 18:42 ` [Qemu-devel] [PULL 25/25] target/i386: Implement CPUID_EXT_RDRAND Richard Henderson
2019-05-23 13:14 ` [Qemu-devel] [PULL 00/25] Add qemu_getrandom and ARMv8.5-RNG etc Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190522184226.17871-18-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).