[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/22] microvm/acpi: use seabios with acpi=on
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 19/22] microvm/acpi: use seabios with acpi=on |
Date: |
Wed, 20 May 2020 15:20:00 +0200 |
With acpi=off continue to use qboot.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 7d8174809ae1..ddb8570a2915 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.bin"
+#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.18.4
- Re: [PATCH v3 15/22] microvm: make virtio irq base runtime configurable, (continued)
[PATCH v3 06/22] acpi: create acpi-common.c and move madt code, Gerd Hoffmann, 2020/05/20
[PATCH v3 12/22] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/05/20
[PATCH v3 17/22] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/05/20
[PATCH v3 19/22] microvm/acpi: use seabios with acpi=on,
Gerd Hoffmann <=
[PATCH v3 05/22] acpi: make build_madt() more generic., Gerd Hoffmann, 2020/05/20
[PATCH v3 18/22] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/05/20
[PATCH v3 10/22] acpi: ged: add control regs, Gerd Hoffmann, 2020/05/20
[PATCH v3 16/22] microvm/acpi: add minimal acpi support, Gerd Hoffmann, 2020/05/20
[PATCH v3 21/22] [RfC] acpi: add per machine type acpi default, Gerd Hoffmann, 2020/05/20