From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 15 Sep 2020 12:08:59 +0000 (+0200)
Subject: microvm/acpi: use seabios with acpi=on
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=67eb6a4007fd8f9073020e506453ff5b7c25cb34;p=qemu.git

microvm/acpi: use seabios with acpi=on

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
---

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index ca0c9983f1..54510a03f7 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);
 }