[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack
From: |
Gerd Hoffmann |
Subject: |
[PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack |
Date: |
Wed, 26 Aug 2020 12:52:46 +0200 |
... 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
- [PATCH v6 00/20] microvm: add acpi support, Gerd Hoffmann, 2020/08/26
- [PATCH v6 01/20] microvm: name qboot binary qboot.rom, Gerd Hoffmann, 2020/08/26
- [PATCH v6 04/20] acpi: ged: add control regs, Gerd Hoffmann, 2020/08/26
- [PATCH v6 02/20] seabios: add microvm config, update build rules, Gerd Hoffmann, 2020/08/26
- [PATCH v6 05/20] acpi: ged: add x86 device variant., Gerd Hoffmann, 2020/08/26
- [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack,
Gerd Hoffmann <=
- [PATCH v6 19/20] tests/acpi: add microvm test, Gerd Hoffmann, 2020/08/26
- [PATCH v6 15/20] x86: move cpu hotplug from pc to x86, Gerd Hoffmann, 2020/08/26
- [PATCH v6 14/20] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/08/26