From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack
Date: Wed, 26 Aug 2020 12:52:46 +0200 [thread overview]
Message-ID: <20200826105254.28496-13-kraxel@redhat.com> (raw)
In-Reply-To: <20200826105254.28496-1-kraxel@redhat.com>
... 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
next prev parent reply other threads:[~2020-08-26 10:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 10:52 [PATCH v6 00/20] microvm: add acpi support Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 01/20] microvm: name qboot binary qboot.rom Gerd Hoffmann
2020-08-27 8:25 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 02/20] seabios: add microvm config, update build rules Gerd Hoffmann
2020-08-27 14:35 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 03/20] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-08-27 14:48 ` Sergio Lopez
2020-08-28 5:02 ` Gerd Hoffmann
2020-08-28 10:57 ` Sergio Lopez
2020-08-28 12:12 ` Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 04/20] acpi: ged: add control regs Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 05/20] acpi: ged: add x86 device variant Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 06/20] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 07/20] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 08/20] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-08-31 8:06 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 10/20] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 11/20] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-08-27 14:54 ` Sergio Lopez
2020-08-26 10:52 ` Gerd Hoffmann [this message]
2020-08-27 8:26 ` [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 13/20] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-08-27 14:56 ` Sergio Lopez
2020-08-31 7:55 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 14/20] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-08-27 14:51 ` Sergio Lopez
2020-08-31 7:54 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 15/20] x86: move cpu hotplug from pc to x86 Gerd Hoffmann
2020-08-27 14:50 ` Sergio Lopez
2020-08-31 7:50 ` Igor Mammedov
2020-08-31 13:12 ` Babu Moger
2020-08-26 10:52 ` [PATCH v6 16/20] microvm: wire up hotplug Gerd Hoffmann
2020-08-27 14:54 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 17/20] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 18/20] tests/acpi: allow override blkdev Gerd Hoffmann
2020-08-27 14:55 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 19/20] tests/acpi: add microvm test Gerd Hoffmann
2020-08-31 7:43 ` Igor Mammedov
2020-08-31 9:46 ` Gerd Hoffmann
2020-08-31 15:00 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 20/20] tests/acpi: update expected data files for microvm Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200826105254.28496-13-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=slp@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).