On Wed, Aug 17, 2022 at 10:39:40AM +0200, Gerd Hoffmann wrote:
> 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 <ja...@zx2c4.com>
> Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Cc: Richard Henderson <richard.hender...@linaro.org>
> Cc: Eduardo Habkost <edua...@habkost.net>
> Cc: Peter Maydell <peter.mayd...@linaro.org>
> Cc: Philippe Mathieu-Daudé <f4...@amsat.org>
> Cc: Laurent Vivier <laur...@vivier.eu>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Will queue ASAP.
> ---
> hw/i386/microvm.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/i386/pc_q35.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 7fe8cce03e92..52cafa003d8a 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -332,7 +332,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
> rom_set_fw(fw_cfg);
>
> 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) {
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index a5c65c1c3527..20962c34e7d8 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -439,6 +439,7 @@ static void pc_i440fx_7_1_machine_options(MachineClass *m)
> m->alias = "pc";
> m->is_default = true;
> pcmc->default_cpu_version = 1;
> + pcmc->legacy_no_rng_seed = true;
> }
>
> 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);
> m->alias = NULL;
> m->is_default = false;
> - pcmc->legacy_no_rng_seed = true;
> 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, pc_compat_7_0, pc_compat_7_0_len);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 3a35193ff74b..2e5dae9a89fa 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -376,6 +376,7 @@ static void pc_q35_7_1_machine_options(MachineClass *m)
> pc_q35_machine_options(m);
> m->alias = "q35";
> pcmc->default_cpu_version = 1;
> + pcmc->legacy_no_rng_seed = true;
> }
>
> 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);
> pc_q35_7_1_machine_options(m);
> m->alias = NULL;
> - pcmc->legacy_no_rng_seed = true;
> 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, pc_compat_7_0, pc_compat_7_0_len);
> --
> 2.37.2
