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

x86: disable rng seeding via setup_data

Browse Source 
Causes regressions when doing direct kernel boots with OVMF.

At this point in the release cycle the only sensible action
is to just disable this for 7.1 and sort it properly in the
7.2 devel cycle.

Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Eduardo Habkost <eduardo@habkost.net>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220817083940.3174933-1-kraxel@redhat.com>
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Eduardo Habkost <eduardo@habkost.net>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2022-08-17 10:39:40 +02:00 committed by Michael S. Tsirkin
parent 643a943554
commit 3824e25db1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/microvm.c
View File

@ -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, false); x86_load_linux(x86ms, fw_cfg, 0, true, true);
} }
if (mms->option_roms) { if (mms->option_roms) {

2
hw/i386/pc_piix.c
View File

@ -439,6 +439,7 @@ static void pc_i440fx_7_1_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_1, "pc-i440fx-7.1", NULL, DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL,
@ -450,7 +451,6 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m)
pc_i440fx_7_1_machine_options(m); pc_i440fx_7_1_machine_options(m);
m->alias = NULL; m->alias = NULL;
m->is_default = false; m->is_default = false;
pcmc->legacy_no_rng_seed = true;
pcmc->enforce_amd_1tb_hole = false; pcmc->enforce_amd_1tb_hole = false;
compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len);
compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len);

2
hw/i386/pc_q35.c
View File

@ -376,6 +376,7 @@ static void pc_q35_7_1_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_1, "pc-q35-7.1", NULL, DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL,
@ -386,7 +387,6 @@ static void pc_q35_7_0_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_7_1_machine_options(m); pc_q35_7_1_machine_options(m);
m->alias = NULL; m->alias = NULL;
pcmc->legacy_no_rng_seed = true;
pcmc->enforce_amd_1tb_hole = false; pcmc->enforce_amd_1tb_hole = false;
compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len);
compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len);