diff mbox series

[XEN] tools/firmware/ovmf: Use OvmfXen platform file is exist

Message ID 20210601102804.698364-1-anthony.perard@citrix.com (mailing list archive)
State New
Headers show
Series [XEN] tools/firmware/ovmf: Use OvmfXen platform file is exist | expand

Commit Message

Anthony PERARD June 1, 2021, 10:28 a.m. UTC
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

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---

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

Comments

Ian Jackson June 8, 2021, 10:29 a.m. UTC | #1
Anthony PERARD writes ("[XEN PATCH] 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
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Acked-by: Ian Jackson <iwj@xenproject.org>

I will commit this in a moment.

Do we need to backport this ?

Ian.
Anthony PERARD June 8, 2021, 10:40 a.m. UTC | #2
On Tue, Jun 08, 2021 at 11:29:58AM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("[XEN PATCH] 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
> > 
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> 
> Acked-by: Ian Jackson <iwj@xenproject.org>
> 
> 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,
diff mbox series

Patch

diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 55f999214545..637ee509c366 100644
--- a/tools/firmware/ovmf-makefile
+++ b/tools/firmware/ovmf-makefile
@@ -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: