mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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-8-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:23 +02:00 committed by Peter Maydell
parent 1ffd007c9c
commit fbbbe7eb23
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/m68k/q800.c
View File

@ -321,27 +321,23 @@ static const TypeInfo glue_info = {
}, },
}; };
typedef struct {
M68kCPU *cpu;
struct bi_record *rng_seed;
} ResetInfo;
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
ResetInfo *reset_info = opaque; M68kCPU *cpu = opaque;
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] = ldl_phys(cs->as, 0); cpu->env.aregs[7] = ldl_phys(cs->as, 0);
cpu->env.pc = ldl_phys(cs->as, 4); cpu->env.pc = ldl_phys(cs->as, 4);
} }
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 uint8_t fake_mac_rom[] = { static uint8_t fake_mac_rom[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -397,7 +393,6 @@ static void q800_init(MachineState *machine)
NubusBus *nubus; NubusBus *nubus;
DeviceState *glue; DeviceState *glue;
DriveInfo *dinfo; DriveInfo *dinfo;
ResetInfo *reset_info;
uint8_t rng_seed[32]; uint8_t rng_seed[32];
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
@ -408,12 +403,9 @@ static void q800_init(MachineState *machine)
exit(1); exit(1);
} }
reset_info = g_new0(ResetInfo, 1);
/* init CPUs */ /* init CPUs */
cpu = M68K_CPU(cpu_create(machine->cpu_type)); cpu = M68K_CPU(cpu_create(machine->cpu_type));
reset_info->cpu = cpu; qemu_register_reset(main_cpu_reset, cpu);
qemu_register_reset(main_cpu_reset, reset_info);
/* RAM */ /* RAM */
memory_region_add_subregion(get_system_memory(), 0, machine->ram); memory_region_add_subregion(get_system_memory(), 0, machine->ram);
@ -687,9 +679,10 @@ static void q800_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);
} else { } else {
uint8_t *ptr; uint8_t *ptr;