[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 01/21] microvm: name qboot binary qboot.rom
From: |
Gerd Hoffmann |
Subject: |
[PATCH v7 01/21] microvm: name qboot binary qboot.rom |
Date: |
Tue, 8 Sep 2020 14:10:30 +0200 |
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>
---
hw/i386/microvm.c | 4 ++--
pc-bios/meson.build | 2 +-
pc-bios/{bios-microvm.bin => qboot.rom} | Bin
roms/Makefile | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
rename pc-bios/{bios-microvm.bin => qboot.rom} (100%)
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/meson.build b/pc-bios/meson.build
index 8087e5c0a7a1..b4aaf31143dd 100644
--- 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/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
- [PATCH v7 00/21] microvm: add acpi support, Gerd Hoffmann, 2020/09/08
- [PATCH v7 02/21] seabios: add microvm config, update build rules, Gerd Hoffmann, 2020/09/08
- [PATCH v7 04/21] acpi: ged: add control regs, Gerd Hoffmann, 2020/09/08
- [PATCH v7 06/21] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/09/08
- [PATCH v7 05/21] acpi: ged: add x86 device variant., Gerd Hoffmann, 2020/09/08
- [PATCH v7 18/21] tests/acpi: allow override blkdev, Gerd Hoffmann, 2020/09/08
- [PATCH v7 21/21] microvm: enable ramfb, Gerd Hoffmann, 2020/09/08
- [PATCH v7 01/21] microvm: name qboot binary qboot.rom,
Gerd Hoffmann <=
- [PATCH v7 07/21] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/09/08
- [PATCH v7 16/21] microvm: wire up hotplug, Gerd Hoffmann, 2020/09/08
- [PATCH v7 12/21] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/09/08
- [PATCH v7 14/21] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/09/08
- [PATCH v7 19/21] tests/acpi: add microvm test, Gerd Hoffmann, 2020/09/08
- [PATCH v7 03/21] seabios: add bios-microvm.bin binary, Gerd Hoffmann, 2020/09/08
- [PATCH v7 10/21] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/09/08
- [PATCH v7 13/21] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/09/08