[v1] microvm: add acpi support

[PATCH 06/13] microvm: disable virtio-mmio cmdline hack

Gerd Hoffmann posted 13 patches 5 years, 10 months ago

Diff against v2 v3 v4 v5 v6 v7 v8
Download mbox

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Sergio Lopez <slp@redhat.com>, Richard Henderson <rth@twiddle.net>, Eduardo Habkost <ehabkost@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>

There is a newer version of this series

Expand all Fold all

[PATCH 06/13] microvm: disable virtio-mmio cmdline hack

Posted by Gerd Hoffmann 5 years, 10 months ago

... in case we are using ACPI.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/microvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 362d513f38e1..fd753764fc10 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -361,7 +361,7 @@ static void microvm_machine_reset(MachineState *machine)
     CPUState *cs;
     X86CPU *cpu;
 
-    if (machine->kernel_filename != NULL &&
+    if (!acpi_enabled && machine->kernel_filename != NULL &&
         mms->auto_kernel_cmdline && !mms->kernel_cmdline_fixed) {
         microvm_fix_kernel_cmdline(machine);
         mms->kernel_cmdline_fixed = true;
-- 
2.18.2