[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/21] microvm/acpi: disable virtio-mmio cmdline hack
From: |
Gerd Hoffmann |
Subject: |
[PULL 12/21] microvm/acpi: disable virtio-mmio cmdline hack |
Date: |
Thu, 17 Sep 2020 15:53:14 +0200 |
... 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
---
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
- [PULL 00/21] Microvm 20200917 patches, Gerd Hoffmann, 2020/09/17
- [PULL 04/21] acpi: ged: add control regs, Gerd Hoffmann, 2020/09/17
- [PULL 05/21] acpi: ged: add x86 device variant., Gerd Hoffmann, 2020/09/17
- [PULL 17/21] tests/acpi: allow microvm test data updates., Gerd Hoffmann, 2020/09/17
- [PULL 01/21] microvm: name qboot binary qboot.rom, Gerd Hoffmann, 2020/09/17
- [PULL 10/21] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/09/17
- [PULL 02/21] seabios: add microvm config, update build rules, Gerd Hoffmann, 2020/09/17
- [PULL 12/21] microvm/acpi: disable virtio-mmio cmdline hack,
Gerd Hoffmann <=
- [PULL 07/21] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/09/17
- [PULL 19/21] tests/acpi: add microvm test, Gerd Hoffmann, 2020/09/17
- [PULL 13/21] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/09/17
- [PULL 21/21] microvm: enable ramfb, Gerd Hoffmann, 2020/09/17
- [PULL 03/21] seabios: add bios-microvm.bin binary, Gerd Hoffmann, 2020/09/17
- [PULL 11/21] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/09/17
- [PULL 16/21] microvm: wire up hotplug, Gerd Hoffmann, 2020/09/17
- [PULL 20/21] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/09/17
- [PULL 06/21] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/09/17
- [PULL 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/09/17