* [XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF
@ 2021-07-19 13:48 Anthony PERARD
2021-07-26 12:39 ` Ping: " Anthony PERARD
0 siblings, 1 reply; 3+ messages in thread
From: Anthony PERARD @ 2021-07-19 13:48 UTC (permalink / raw)
To: xen-devel
Cc: Anthony PERARD, Andrew Cooper, George Dunlap, Ian Jackson,
Jan Beulich, Julien Grall, Stefano Stabellini, Wei Liu
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
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
mapping").
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@citrix.com>
---
https://xenbits.xen.org/git-http/ovmf.git master branch as been
update.
I've runned a flight on osstest with this change:
http://logs.test-lab.xenproject.org/osstest/logs/163715/
---
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 ?= git://xenbits.xen.org/qemu-xen-traditional.git
SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
endif
-OVMF_UPSTREAM_REVISION ?= e1999b264f1f9d7230edf2448f757c73da567832
+OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
QEMU_UPSTREAM_REVISION ?= master
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
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
clean:
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Ping: [XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF
2021-07-19 13:48 [XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF Anthony PERARD
@ 2021-07-26 12:39 ` Anthony PERARD
2021-07-27 13:26 ` Ian Jackson
0 siblings, 1 reply; 3+ messages in thread
From: Anthony PERARD @ 2021-07-26 12:39 UTC (permalink / raw)
To: xen-devel
Cc: Andrew Cooper, George Dunlap, Ian Jackson, Jan Beulich,
Julien Grall, Stefano Stabellini, Wei Liu
On Mon, Jul 19, 2021 at 02:48:45PM +0100, Anthony PERARD wrote:
> 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
> 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
> mapping").
>
> 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@citrix.com>
Can we commit this soon? Thanks.
--
Anthony PERARD
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Ping: [XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF
2021-07-26 12:39 ` Ping: " Anthony PERARD
@ 2021-07-27 13:26 ` Ian Jackson
0 siblings, 0 replies; 3+ messages in thread
From: Ian Jackson @ 2021-07-27 13:26 UTC (permalink / raw)
To: Anthony PERARD
Cc: xen-devel, Andrew Cooper, George Dunlap, Jan Beulich,
Julien Grall, Stefano Stabellini, Wei Liu
Anthony PERARD writes ("Ping: [XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF"):
> On Mon, Jul 19, 2021 at 02:48:45PM +0100, Anthony PERARD wrote:
> > A platform introduced in EDK II named OvmfXen is now the one to use for
> > Xen instead of OvmfX64. It comes with PVH support.
...
> Can we commit this soon? Thanks.
Acked-by: Ian Jackson <iwj@xenproject.org>
and queued. Sorry for the delay.
Ian.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-27 13:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-19 13:48 [XEN PATCH] tools/firmware/ovmf: Use OvmfXen platform file if exist and update OVMF Anthony PERARD
2021-07-26 12:39 ` Ping: " Anthony PERARD
2021-07-27 13:26 ` Ian Jackson
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.