Update Xen version to 4.0.4

diff --git a/Config.mk b/Config.mk
index 90c88e769a331e7552f863671ff88150d22c7556..2ed1aa721da0208fc08761c658af12f6c3d17ecb 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -178,7 +178,7 @@ endif
 # CONFIG_QEMU ?= ../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG := xen-4.0.4-rc3
+QEMU_TAG := xen-4.0.4
 # Thu Feb 2 13:47:06 2012 +0000
 # e1000: bounds packet size against buffer size
 

diff --git a/xen/Makefile b/xen/Makefile
index cbadd719c5d83deb4c7a3f2252057cadf6d70527..63cc2be70252ab9438d5e88b9154538096a34483 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    = 0
-export XEN_EXTRAVERSION ?= .4-rc4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version