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>,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PULL 12/21] microvm/acpi: disable virtio-mmio cmdline hack
Date: Thu, 17 Sep 2020 15:53:14 +0200 [thread overview]
Message-ID: <20200917135323.18022-13-kraxel@redhat.com> (raw)
In-Reply-To: <20200917135323.18022-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>
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
next prev parent reply other threads:[~2020-09-17 14:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 13:53 [PULL 00/21] Microvm 20200917 patches Gerd Hoffmann
2020-09-17 13:53 ` [PULL 01/21] microvm: name qboot binary qboot.rom Gerd Hoffmann
2020-09-17 13:53 ` [PULL 02/21] seabios: add microvm config, update build rules Gerd Hoffmann
2020-09-17 13:53 ` [PULL 03/21] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-09-17 13:53 ` [PULL 04/21] acpi: ged: add control regs Gerd Hoffmann
2021-06-24 9:17 ` Peter Maydell
2021-06-24 9:42 ` Gerd Hoffmann
2020-09-17 13:53 ` [PULL 05/21] acpi: ged: add x86 device variant Gerd Hoffmann
2020-09-17 13:53 ` [PULL 06/21] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-09-17 13:53 ` [PULL 07/21] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-09-17 13:53 ` [PULL 08/21] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-09-17 13:53 ` [PULL 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-09-17 13:53 ` [PULL 10/21] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-09-17 13:53 ` [PULL 11/21] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-09-17 13:53 ` Gerd Hoffmann [this message]
2020-09-17 13:53 ` [PULL 13/21] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-09-17 13:53 ` [PULL 14/21] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-09-17 13:53 ` [PULL 15/21] x86: move cpu hotplug from pc to x86 Gerd Hoffmann
2020-09-17 13:53 ` [PULL 16/21] microvm: wire up hotplug Gerd Hoffmann
2020-09-17 13:53 ` [PULL 17/21] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-09-17 13:53 ` [PULL 18/21] tests/acpi: allow override blkdev Gerd Hoffmann
2020-09-17 13:53 ` [PULL 19/21] tests/acpi: add microvm test Gerd Hoffmann
2020-09-17 13:53 ` [PULL 20/21] tests/acpi: update expected data files for microvm Gerd Hoffmann
2020-09-17 13:53 ` [PULL 21/21] microvm: enable ramfb Gerd Hoffmann
2020-09-18 9:35 ` [PULL 00/21] Microvm 20200917 patches Peter Maydell
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=20200917135323.18022-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).