| Message ID | 20190315032629.21234-17-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add qemu_getrandom and ARMv8.5-RNG etc | expand |
On Fri, 15 Mar 2019 at 03:26, Richard Henderson <richard.henderson@linaro.org> wrote: > > 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. Nice! Reviewed-by: Joel Stanley <joel@jms.id.au> > > Cc: qemu-arm@nongnu.org > Cc: Cédric Le Goater <clg@kaod.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: 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.2 >
On 3/15/19 4:26 AM, Richard Henderson wrote: > 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. > > Cc: qemu-arm@nongnu.org > Cc: Cédric Le Goater <clg@kaod.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Thanks Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > 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; > } > >
On 3/15/19 4:26 AM, Richard Henderson wrote: > 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. > > Cc: qemu-arm@nongnu.org > Cc: Cédric Le Goater <clg@kaod.org> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: 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; > } > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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; }
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. Cc: qemu-arm@nongnu.org Cc: Cédric Le Goater <clg@kaod.org> Cc: Andrew Jeffery <andrew@aj.id.au> Cc: 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(-)