diff mbox series

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

Message ID 20200505134305.22666-11-kraxel@redhat.com
State Superseded
Headers show
Series microvm: add acpi support | expand

Commit Message

Gerd Hoffmann May 5, 2020, 1:43 p.m. UTC 
... in case we are using ACPI.

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

Patch

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;