[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 11/20] microvm/acpi: use seabios with acpi=on
From: |
Gerd Hoffmann |
Subject: |
[PATCH v6 11/20] microvm/acpi: use seabios with acpi=on |
Date: |
Wed, 26 Aug 2020 12:52:45 +0200 |
With acpi=off continue to use qboot.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@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
- Re: [PATCH v6 03/20] seabios: add bios-microvm.bin binary, (continued)
- [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/08/26
- [PATCH v6 10/20] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/08/26
- [PATCH v6 07/20] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/08/26
- [PATCH v6 20/20] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/08/26
- [PATCH v6 08/20] microvm/acpi: add minimal acpi support, Gerd Hoffmann, 2020/08/26
- [PATCH v6 17/20] tests/acpi: allow microvm test data updates., Gerd Hoffmann, 2020/08/26
- [PATCH v6 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/08/26
- [PATCH v6 11/20] microvm/acpi: use seabios with acpi=on,
Gerd Hoffmann <=
- [PATCH v6 16/20] microvm: wire up hotplug, Gerd Hoffmann, 2020/08/26
- [PATCH v6 14/20] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/08/26
- [PATCH v6 18/20] tests/acpi: allow override blkdev, Gerd Hoffmann, 2020/08/26
- [PATCH v6 06/20] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/08/26
- [PATCH v6 13/20] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/08/26