x86: re-enable rng seeding via SetupData
This reverts 3824e25db1
("x86: disable rng seeding via setup_data"), but
for 7.2 rather than 7.1, now that modifying setup_data is safe to do.
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-4-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
763a2828bf
commit
ffe2d2382e
|
@ -332,7 +332,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
|
||||||
rom_set_fw(fw_cfg);
|
rom_set_fw(fw_cfg);
|
||||||
|
|
||||||
if (machine->kernel_filename != NULL) {
|
if (machine->kernel_filename != NULL) {
|
||||||
x86_load_linux(x86ms, fw_cfg, 0, true, true);
|
x86_load_linux(x86ms, fw_cfg, 0, true, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mms->option_roms) {
|
if (mms->option_roms) {
|
||||||
|
|
|
@ -439,7 +439,6 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
|
||||||
m->alias = "pc";
|
m->alias = "pc";
|
||||||
m->is_default = true;
|
m->is_default = true;
|
||||||
pcmc->default_cpu_version = 1;
|
pcmc->default_cpu_version = 1;
|
||||||
pcmc->legacy_no_rng_seed = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
|
DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
|
||||||
|
@ -447,9 +446,11 @@ DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
|
||||||
|
|
||||||
static void pc_i440fx_7_1_machine_options(MachineClass *m)
|
static void pc_i440fx_7_1_machine_options(MachineClass *m)
|
||||||
{
|
{
|
||||||
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||||||
pc_i440fx_7_2_machine_options(m);
|
pc_i440fx_7_2_machine_options(m);
|
||||||
m->alias = NULL;
|
m->alias = NULL;
|
||||||
m->is_default = false;
|
m->is_default = false;
|
||||||
|
pcmc->legacy_no_rng_seed = true;
|
||||||
compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
|
compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
|
||||||
compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
|
compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -376,7 +376,6 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
|
||||||
pc_q35_machine_options(m);
|
pc_q35_machine_options(m);
|
||||||
m->alias = "q35";
|
m->alias = "q35";
|
||||||
pcmc->default_cpu_version = 1;
|
pcmc->default_cpu_version = 1;
|
||||||
pcmc->legacy_no_rng_seed = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
|
DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
|
||||||
|
@ -384,8 +383,10 @@ DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
|
||||||
|
|
||||||
static void pc_q35_7_1_machine_options(MachineClass *m)
|
static void pc_q35_7_1_machine_options(MachineClass *m)
|
||||||
{
|
{
|
||||||
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||||||
pc_q35_7_2_machine_options(m);
|
pc_q35_7_2_machine_options(m);
|
||||||
m->alias = NULL;
|
m->alias = NULL;
|
||||||
|
pcmc->legacy_no_rng_seed = true;
|
||||||
compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
|
compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
|
||||||
compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
|
compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue