[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF

  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Anthony PERARD <anthony.perard@xxxxxxxxxx>
  • Date: Mon, 19 Jul 2021 14:48:45 +0100
  • Authentication-results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, "Ian Jackson" <iwj@xxxxxxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
  • Delivery-date: Mon, 19 Jul 2021 13:49:01 +0000
  • Ironport-hdrordr: A9a23:CSNKu6MtJ/39D8BcTs2jsMiBIKoaSvp037Eqv3oedfUzSL39qy nOpoV86faaslYssR0b9exoW5PwJE80l6QFgrX5VI3KNGKN1VdARLsSircKqAeAJ8SRzIFgPN 9bAspDNOE=
  • Ironport-sdr: 5YxjKIIjwEH4Fl14jFegKNIk1DCXPUBiYzXznmFUPfyEFUhvZ4PvnvvBK8Hk9S4fH5sCylRLUf 3exRDCZECKDQnVn4j7lefjgA1YnLMmWVPgRXQE8AZIHw0AsLvZH9TpuyEBW0SSb0MBeK4Pm3kx INNsLQFBPdreZohM0eKlWGkqD8wbMNoC9x/ot7s8E5c1DxEHGsg+i2v8uc1DGZSrpWNEHPIq9R /fHdyJ/9RdV3LwbJsNgpw9jeoe2rm2vN6bFnJf5tMKrSrW7CBvI6BURLFOmfeIfzhNk01mz0l4 7ZnWRb7IqdXBeFsgwNphckkM
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

A platform introduced in EDK II named OvmfXen is now the one to use for
Xen instead of OvmfX64. It comes with PVH support.

Also, the Xen support in OvmfX64 is deprecated,
    "deprecation notice: *dynamic* multi-VMM (QEMU vs. Xen) support in OvmfPkg"
and has been removed upstream.

We need to also update to a newer version of OVMF as OvmfXen in the
release "edk2-stable202105" doesn't work well with Xen, so we need the
fix b37cfdd28071 ("OvmfPkg/XenPlatformPei: Relocate shared_info page

Also, don't set anymore the number of thread for parallel build when
building the newer platform, OvmfPkg/build.sh is now doing parallel
build by default.

Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
https://xenbits.xen.org/git-http/ovmf.git master branch as been

I've runned a flight on osstest with this change:
 Config.mk                    |  2 +-
 tools/firmware/ovmf-makefile | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Config.mk b/Config.mk
index f9dce4549b7c..4d723eec1d0d 100644
--- a/Config.mk
+++ b/Config.mk
@@ -244,7 +244,7 @@ QEMU_TRADITIONAL_URL ?= 
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
-OVMF_UPSTREAM_REVISION ?= e1999b264f1f9d7230edf2448f757c73da567832
+OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
 MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 55f999214545..1f619a518993 100644
--- a/tools/firmware/ovmf-makefile
+++ b/tools/firmware/ovmf-makefile
@@ -17,8 +17,14 @@ all: build
 .PHONY: build
        if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
-       OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4
-       cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin
+       set -ex; \
+       if test -e OvmfPkg/OvmfXen.dsc; then \
+         OvmfPkg/build.sh -a X64 -b $(TARGET) -p OvmfPkg/OvmfXen.dsc; \
+         cp Build/OvmfXen/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin; \
+       else \
+         OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4; \
+         cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin; \
+       fi
 .PHONY: clean
Anthony PERARD



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.