[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 11/20] microvm/acpi: use seabios with acpi=on
From: |
Gerd Hoffmann |
Subject: |
[PATCH v5 11/20] microvm/acpi: use seabios with acpi=on |
Date: |
Tue, 7 Jul 2020 14:53:47 +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 1bcd57a6fd80..ac605d92b984 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.18.4
- Re: [PATCH v5 19/20] tests/acpi: add microvm test, (continued)
[PATCH v5 13/20] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/07/07
[PATCH v5 12/20] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/07/07
[PATCH v5 16/20] microvm: wire up hotplug, Gerd Hoffmann, 2020/07/07
[PATCH v5 10/20] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/07/07
[PATCH v5 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/07/07
[PATCH v5 18/20] tests/acpi: allow override blkdev, Gerd Hoffmann, 2020/07/07
[PATCH v5 11/20] microvm/acpi: use seabios with acpi=on,
Gerd Hoffmann <=
[PATCH v5 15/20] x86: move cpu plug from pc to x86, Gerd Hoffmann, 2020/07/07
Re: [PATCH v5 00/20] microvm: add acpi support, no-reply, 2020/07/07
Re: [PATCH v5 00/20] microvm: add acpi support, no-reply, 2020/07/07