update Xen version to 4.15.4

diff --git a/Config.mk b/Config.mk
index 9f87608f6602d6c3ca64c3d8df79885a6f3abbf2..9696e1a1514a67fee53e4f9858082b0066f5717a 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -244,15 +244,15 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= a3741780fe3535e19e02efa869a7cac481891129
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.15.3
-MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.15.3
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.15.4
+MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.15.4
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
 
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= xen-4.15.3
+QEMU_TRADITIONAL_REVISION ?= xen-4.15.4
 
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.

diff --git a/xen/Makefile b/xen/Makefile
index cd66bb3b1c8402d1855a9881c63c8c1ed7c95611..fc692c00dab0dc2fc8b5e00dd5c64bb89c484b82 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 15
-export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version