[v6] microvm: add acpi support

[PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack

Posted by Gerd Hoffmann 5 years, 3 months ago

... in case we are using ACPI.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
 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 54510a03f754..04209eb38fbe 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -343,7 +343,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;
-- 
2.27.0

Re: [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack

Posted by Sergio Lopez 5 years, 3 months ago

On Wed, Aug 26, 2020 at 12:52:46PM +0200, Gerd Hoffmann wrote:
> ... in case we are using ACPI.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  hw/i386/microvm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Sergio Lopez <slp@redhat.com>

> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 54510a03f754..04209eb38fbe 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -343,7 +343,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;
> -- 
> 2.27.0
>