On Wed, Aug 26, 2020 at 12:52:45PM +0200, Gerd Hoffmann wrote:
> With acpi=off continue to use qboot.
> 
> Signed-off-by: Gerd Hoffmann <[email protected]>
> Reviewed-by: Igor Mammedov <[email protected]>
> ---
>  hw/i386/microvm.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Sergio Lopez <[email protected]>


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

Attachment: signature.asc
Description: PGP signature

Reply via email to