From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 15 Sep 2020 12:09:00 +0000 (+0200)
Subject: microvm/acpi: disable virtio-mmio cmdline hack
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846;p=qemu.git

microvm/acpi: disable virtio-mmio cmdline hack

... in case we are using ACPI.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-13-kraxel@redhat.com
---

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 54510a03f7..04209eb38f 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;