Skip to contentSkip to conversation

tools/firmware/ovmf: Use OvmfXen platform file is exist

PATCH In review Anthony PERARD 2 participants 3 messages Jun 1, 2021 – Jun 8, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/firmware/ovmf: Use OvmfXen platform file is exist

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"
https://edk2.groups.io/g/devel/message/75498

---

PVH support isn't working at the moment, but that's just a detail :-)

---
 tools/firmware/ovmf-makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
tools/firmware/ovmf-makefile +8 -2
index 55f999214545..637ee509c366 100644
@@ -17,8 +17,14 @@ all: build
 .PHONY: build
 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) -n 4 -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
 clean:
Signature · 1 line
Anthony PERARD
Acked-by on v1 1/1
#1 lore raw

Anthony PERARD writes ("[XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file is exist"):

Quoted 8 lines

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"
https://edk2.groups.io/g/devel/message/75498

I will commit this in a moment.

Do we need to backport this ?

Ian.

#2 lore raw
Quoted 8 lines · Ian Jackson

Anthony PERARD writes ("[XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file is exist"):

Quoted 7 lines

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"
https://edk2.groups.io/g/devel/message/75498

Quoted 7 lines
Quoted 1 line

I will commit this in a moment.

Do we need to backport this ?

Yes, because osstest is wired to use the latest version of OVMF.

Thanks,

Signature · 1 line
Anthony PERARD