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

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

commit aad7b5c11d51d57659978e04702ac970906894e8
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Tue Jun 1 11:28:03 2021 +0100
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Tue Jun 8 11:31:10 2021 +0100

    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 
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
 tools/firmware/ovmf-makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 55f9992145..637ee509c3 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) -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
generated by git-patchbot for /home/xen/git/xen.git#master



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