microvm: name qboot binary qboot.rom

qboot isn't a bios and shouldnt be named that way.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200915120909.20838-2-kraxel@redhat.com

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 81d0888930d10cb35e03792f9ca325a3c972c4c3..b1dc7e49c159b1c9964f0fafdc671da6c892d00d 100644 (file)
--- 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/bios-microvm.bin
deleted file mode 100644 (file)
index 45eabc5..0000000
Binary files a/pc-bios/bios-microvm.bin and /dev/null differ

diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 182d5ebb35de1aa7e05aa6d0698b3689925680d9..9759dba09714db665ee4f33e6f7b779c49bbf9b3 100644 (file)
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -27,7 +27,7 @@ endif
 blobs = files(
   'bios.bin',
   'bios-256k.bin',
-  'bios-microvm.bin',
+  'qboot.rom',
   'sgabios.bin',
   'vgabios.bin',
   'vgabios-cirrus.bin',

diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom
new file mode 100644 (file)
index 0000000..45eabc5
Binary files /dev/null and b/pc-bios/qboot.rom differ

diff --git a/roms/Makefile b/roms/Makefile
index 3726f06fe7ebadccc797cb4b47227e33170b4849..1395a46695be1a5ce189fcd7e86302c98017294f 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -68,7 +68,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"
 
@@ -183,9 +183,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
 
 npcm7xx_bootrom:
        $(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix)