aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Jackson <ian.jackson@eu.citrix.com>2013-07-17 12:02:42 +0100
committerIan Jackson <Ian.Jackson@eu.citrix.com>2013-07-17 12:02:42 +0100
commita2b1a38013f6ca8399808cfa94bf84ea4f1133ac (patch)
tree2e0ae15ab0c862d4b3ef9f9b18a82119ddf3f334
parent5e0288ecf2d6e88db03ad2c31801b3bed77907a8 (diff)
downloadxen-a2b1a38013f6ca8399808cfa94bf84ea4f1133ac.tar.gz
xen-a2b1a38013f6ca8399808cfa94bf84ea4f1133ac.tar.bz2
xen-a2b1a38013f6ca8399808cfa94bf84ea4f1133ac.zip
QEMU_TAG update
-rw-r--r--Config.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Config.mk b/Config.mk
index 7989a3ff0c..293b817296 100644
--- a/Config.mk
+++ b/Config.mk
@@ -180,9 +180,9 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= xen-4.1.5
-# Thu Jan 17 15:52:16 2013 +0000
-# e1000: fix compile warning introduced by security fix, and debugging
+QEMU_TAG ?= 4904cdf6166687198fc29cb30ca0fa09f316486f
+# Tue May 14 18:48:49 2013 +0100
+# piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug.
# Optional components
XENSTAT_XENTOP ?= y