On Wed, 20 May 2020 15:20:00 +0200
Gerd Hoffmann <kra...@redhat.com> wrote:
> With acpi=off continue to use qboot.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@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 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);
> }
