Update Xen version to 4.0.4-rc1

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

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