diff options
| author | Gerd Hoffmann | 2020-09-15 14:09:00 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2020-09-17 14:16:19 +0200 |
| commit | f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846 (patch) | |
| tree | 7e5353b1ec2c024dbbe658496c65ebe9fa033ef3 /hw/i386 | |
| parent | microvm/acpi: use seabios with acpi=on (diff) | |
| download | qemu-f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846.tar.gz qemu-f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846.tar.xz qemu-f6f7e2d88d0b29d8b6e1a12a5f3f9f31faff9846.zip | |
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
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/microvm.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |