Re: [PATCH v6 01/20] microvm: name qboot binary qboot.rom

[Sergio Lopez]

On Wed, Aug 26, 2020 at 12:52:35PM +0200, Gerd Hoffmann wrote:
> qboot isn't a bios and shouldnt be named that way.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/i386/microvm.c                       |   4 ++--
>  pc-bios/{bios-microvm.bin => qboot.rom} | Bin
>  roms/Makefile                           |   6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)
>  rename pc-bios/{bios-microvm.bin => qboot.rom} (100%)

Reviewed-by: Sergio Lopez <slp@redhat.com>

> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 81d0888930d1..b1dc7e49c159 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -47,7 +47,7 @@
>  #include "kvm_i386.h"
>  #include "hw/xen/start_info.h"
>  
> -#define MICROVM_BIOS_FILENAME "bios-microvm.bin"
> +#define MICROVM_QBOOT_FILENAME "qboot.rom"
>  
>  static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s)
>  {
> @@ -158,7 +158,7 @@ static void microvm_devices_init(MicrovmMachineState *mms)
>      }
>  
>      if (bios_name == NULL) {
> -        bios_name = MICROVM_BIOS_FILENAME;
> +        bios_name = MICROVM_QBOOT_FILENAME;
>      }
>      x86_bios_rom_init(get_system_memory(), true);
>  }
> diff --git a/pc-bios/bios-microvm.bin b/pc-bios/qboot.rom
> similarity index 100%
> rename from pc-bios/bios-microvm.bin
> rename to pc-bios/qboot.rom
> diff --git a/roms/Makefile b/roms/Makefile
> index 5d9f15b6777f..2673a39f9dc2 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -66,7 +66,7 @@ default help:
>       @echo "  efi                -- update UEFI (edk2) platform firmware"
>       @echo "  opensbi32-generic  -- update OpenSBI for 32-bit generic 
> machine"
>       @echo "  opensbi64-generic  -- update OpenSBI for 64-bit generic 
> machine"
> -     @echo "  bios-microvm       -- update bios-microvm.bin (qboot)"
> +     @echo "  qboot              -- update qboot"
>       @echo "  clean              -- delete the files generated by the 
> previous" \
>                                     "build targets"
>  
> @@ -182,9 +182,9 @@ opensbi64-generic:
>       cp opensbi/build/platform/generic/firmware/fw_dynamic.bin 
> ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
>       cp opensbi/build/platform/generic/firmware/fw_dynamic.elf 
> ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
>  
> -bios-microvm:
> +qboot:
>       $(MAKE) -C qboot
> -     cp qboot/bios.bin ../pc-bios/bios-microvm.bin
> +     cp qboot/bios.bin ../pc-bios/qboot.rom
>  
>  clean:
>       rm -rf seabios/.config seabios/out seabios/builds
> -- 
> 2.27.0
>

signature.asc
Description: PGP signature