All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Thomas Huth <thuth@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Sergio Lopez <slp@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Shannon Zhao <shannon.zhaosl@gmail.com>,
	qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [PATCH v6 01/20] microvm: name qboot binary qboot.rom
Date: Wed, 26 Aug 2020 12:52:35 +0200	[thread overview]
Message-ID: <20200826105254.28496-2-kraxel@redhat.com> (raw)
In-Reply-To: <20200826105254.28496-1-kraxel@redhat.com>

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

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



  reply	other threads:[~2020-08-26 10:54 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-26 10:52 [PATCH v6 00/20] microvm: add acpi support Gerd Hoffmann
2020-08-26 10:52 ` Gerd Hoffmann [this message]
2020-08-27  8:25   ` [PATCH v6 01/20] microvm: name qboot binary qboot.rom Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 02/20] seabios: add microvm config, update build rules Gerd Hoffmann
2020-08-27 14:35   ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 03/20] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-08-27 14:48   ` Sergio Lopez
2020-08-28  5:02     ` Gerd Hoffmann
2020-08-28 10:57       ` Sergio Lopez
2020-08-28 12:12         ` Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 04/20] acpi: ged: add control regs Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 05/20] acpi: ged: add x86 device variant Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 06/20] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 07/20] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 08/20] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-08-31  8:06   ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 10/20] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 11/20] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-08-27 14:54   ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-08-27  8:26   ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 13/20] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-08-27 14:56   ` Sergio Lopez
2020-08-31  7:55   ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 14/20] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-08-27 14:51   ` Sergio Lopez
2020-08-31  7:54   ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 15/20] x86: move cpu hotplug from pc to x86 Gerd Hoffmann
2020-08-27 14:50   ` Sergio Lopez
2020-08-31  7:50   ` Igor Mammedov
2020-08-31 13:12     ` Babu Moger
2020-08-26 10:52 ` [PATCH v6 16/20] microvm: wire up hotplug Gerd Hoffmann
2020-08-27 14:54   ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 17/20] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 18/20] tests/acpi: allow override blkdev Gerd Hoffmann
2020-08-27 14:55   ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 19/20] tests/acpi: add microvm test Gerd Hoffmann
2020-08-31  7:43   ` Igor Mammedov
2020-08-31  9:46     ` Gerd Hoffmann
2020-08-31 15:00   ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 20/20] tests/acpi: update expected data files for microvm Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200826105254.28496-2-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=shannon.zhaosl@gmail.com \
    --cc=slp@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.