ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

m68k/virt: do not re-randomize RNG seed on snapshot load 

Snapshot loading is supposed to be deterministic, so we shouldn't
re-randomize the various seeds used.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-id: 20221025004327.568476-7-Jason@zx2c4.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Jason A. Donenfeld 2022-10-25 02:43:22 +02:00 committed by Peter Maydell
parent 64c75db3c5
commit 1ffd007c9c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/m68k/virt.c
View File

@ -89,7 +89,6 @@ typedef struct {
M68kCPU *cpu; M68kCPU *cpu;
hwaddr initial_pc; hwaddr initial_pc;
hwaddr initial_stack; hwaddr initial_stack;
struct bi_record *rng_seed;
} ResetInfo; } ResetInfo;
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
@ -98,16 +97,18 @@ static void main_cpu_reset(void *opaque)
M68kCPU *cpu = reset_info->cpu; M68kCPU *cpu = reset_info->cpu;
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
if (reset_info->rng_seed) {
qemu_guest_getrandom_nofail((void *)reset_info->rng_seed->data + 2,
be16_to_cpu(*(uint16_t *)reset_info->rng_seed->data));
}
cpu_reset(cs); cpu_reset(cs);
cpu->env.aregs[7] = reset_info->initial_stack; cpu->env.aregs[7] = reset_info->initial_stack;
cpu->env.pc = reset_info->initial_pc; cpu->env.pc = reset_info->initial_pc;
} }
static void rerandomize_rng_seed(void *opaque)
{
struct bi_record *rng_seed = opaque;
qemu_guest_getrandom_nofail((void *)rng_seed->data + 2,
be16_to_cpu(*(uint16_t *)rng_seed->data));
}
static void virt_init(MachineState *machine) static void virt_init(MachineState *machine)
{ {
M68kCPU *cpu = NULL; M68kCPU *cpu = NULL;
@ -289,9 +290,10 @@ static void virt_init(MachineState *machine)
BOOTINFO0(param_ptr, BI_LAST); BOOTINFO0(param_ptr, BI_LAST);
rom_add_blob_fixed_as("bootinfo", param_blob, param_ptr - param_blob, rom_add_blob_fixed_as("bootinfo", param_blob, param_ptr - param_blob,
parameters_base, cs->as); parameters_base, cs->as);
reset_info->rng_seed = rom_ptr_for_as(cs->as, parameters_base, qemu_register_reset_nosnapshotload(rerandomize_rng_seed,
param_ptr - param_blob) + rom_ptr_for_as(cs->as, parameters_base,
(param_rng_seed - param_blob); param_ptr - param_blob) +
(param_rng_seed - param_blob));
g_free(param_blob); g_free(param_blob);
} }
} }