qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Gerd Hoffmann
Subject: [PATCH 06/13] microvm: disable virtio-mmio cmdline hack
Date: Thu, 19 Mar 2020 09:01:10 +0100

... in case we are using ACPI.

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]