diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-06-26 13:18:04 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2022-07-06 12:30:41 +0200 |
| commit | a988465d0eb7e2ee31a3679bbe3fbe71681820da (patch) | |
| tree | c8bd43d7565293669d195147ee87e11cab488a6c /hw | |
| parent | 23f0a6c80d9dc05508a9c63e29e9ded905186099 (diff) | |
| download | qemu-a988465d0eb7e2ee31a3679bbe3fbe71681820da.zip qemu-a988465d0eb7e2ee31a3679bbe3fbe71681820da.tar.gz qemu-a988465d0eb7e2ee31a3679bbe3fbe71681820da.tar.bz2 | |
m68k: virt: pass RNG seed via bootinfo block
This commit wires up bootinfo's RNG seed attribute so that Linux VMs can
have their RNG seeded from the earliest possible time in boot, just like
the "rng-seed" device tree property on those platforms. The link
contains the corresponding Linux patch.
Link: https://lore.kernel.org/lkml/20220626111509.330159-1-Jason@zx2c4.com/
Based-on: <20220625152318.120849-1-Jason@zx2c4.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Message-Id: <20220626111804.330745-1-Jason@zx2c4.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/m68k/bootinfo.h | 16 | ||||
| -rw-r--r-- | hw/m68k/virt.c | 7 |
2 files changed, 23 insertions, 0 deletions
diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h index ff4e155..bd8b212 100644 --- a/hw/m68k/bootinfo.h +++ b/hw/m68k/bootinfo.h @@ -56,4 +56,20 @@ stb_phys(as, base++, 0); \ base = (base + 1) & ~1; \ } while (0) + +#define BOOTINFODATA(as, base, id, data, len) \ + do { \ + int i; \ + stw_phys(as, base, id); \ + base += 2; \ + stw_phys(as, base, \ + (sizeof(struct bi_record) + len + 3) & ~1); \ + base += 2; \ + stw_phys(as, base, len); \ + base += 2; \ + for (i = 0; i < len; ++i) { \ + stb_phys(as, base++, data[i]); \ + } \ + base = (base + 1) & ~1; \ + } while (0) #endif diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index e215aa3..0aa383f 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/guest-random.h" #include "sysemu/sysemu.h" #include "cpu.h" #include "hw/boards.h" @@ -120,6 +121,7 @@ static void virt_init(MachineState *machine) hwaddr io_base; int i; ResetInfo *reset_info; + uint8_t rng_seed[32]; if (ram_size > 3399672 * KiB) { /* @@ -245,6 +247,11 @@ static void virt_init(MachineState *machine) kernel_cmdline); } + /* Pass seed to RNG. */ + qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed)); + BOOTINFODATA(cs->as, parameters_base, BI_VIRT_RNG_SEED, + rng_seed, sizeof(rng_seed)); + /* load initrd */ if (initrd_filename) { initrd_size = get_image_size(initrd_filename); |