[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/21] microvm/acpi: use seabios with acpi=on
From: |
Gerd Hoffmann |
Subject: |
[PULL 11/21] microvm/acpi: use seabios with acpi=on |
Date: |
Thu, 17 Sep 2020 15:53:13 +0200 |
With acpi=off continue to use qboot.
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-12-kraxel@redhat.com
---
hw/i386/microvm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index ca0c9983f137..54510a03f754 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -52,6 +52,7 @@
#include "hw/xen/start_info.h"
#define MICROVM_QBOOT_FILENAME "qboot.rom"
+#define MICROVM_BIOS_FILENAME "bios-microvm.bin"
static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s)
{
@@ -174,7 +175,9 @@ static void microvm_devices_init(MicrovmMachineState *mms)
}
if (bios_name == NULL) {
- bios_name = MICROVM_QBOOT_FILENAME;
+ bios_name = x86_machine_is_acpi_enabled(x86ms)
+ ? MICROVM_BIOS_FILENAME
+ : MICROVM_QBOOT_FILENAME;
}
x86_bios_rom_init(get_system_memory(), true);
}
--
2.27.0
- [PULL 17/21] tests/acpi: allow microvm test data updates., (continued)
- [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, 2020/09/17
- [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 <=
- [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
- [PULL 14/21] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/09/17
- [PULL 08/21] microvm/acpi: add minimal acpi support, Gerd Hoffmann, 2020/09/17
- [PULL 15/21] x86: move cpu hotplug from pc to x86, Gerd Hoffmann, 2020/09/17
- [PULL 18/21] tests/acpi: allow override blkdev, Gerd Hoffmann, 2020/09/17
- Re: [PULL 00/21] Microvm 20200917 patches, Peter Maydell, 2020/09/18