Re: [PATCH v2 10/13] microvm: disable virtio-mmio cmdline hack

[Igor Mammedov]

On Tue,  5 May 2020 15:43:02 +0200
Gerd Hoffmann <address@hidden> wrote:

> ... in case we are using ACPI.
> 
> Signed-off-by: Gerd Hoffmann <address@hidden>

Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  hw/i386/microvm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 6ba2d9d3f028..a3708fdf1e39 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -369,7 +369,8 @@ static void microvm_machine_reset(MachineState *machine)
>      CPUState *cs;
>      X86CPU *cpu;
>  
> -    if (machine->kernel_filename != NULL &&
> +    if (!x86_machine_is_acpi_enabled(X86_MACHINE(machine)) &&
> +        machine->kernel_filename != NULL &&
>          mms->auto_kernel_cmdline && !mms->kernel_cmdline_fixed) {
>          microvm_fix_kernel_cmdline(machine);
>          mms->kernel_cmdline_fixed = true;