aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorIan Jackson <Ian.Jackson@eu.citrix.com>2011-12-05 13:45:38 +0000
committerIan Jackson <Ian.Jackson@eu.citrix.com>2011-12-05 13:45:38 +0000
commitb4756b45ac1253c25973d687db739146d7d8ccfe (patch)
treecf035598ecf499e42e2ba9b3a5b6509369d442c2 /Config.mk
parent38107100e8043acf2de5893a95bfa4b867c65fb7 (diff)
downloadxen-b4756b45ac1253c25973d687db739146d7d8ccfe.tar.gz
xen-b4756b45ac1253c25973d687db739146d7d8ccfe.tar.bz2
xen-b4756b45ac1253c25973d687db739146d7d8ccfe.zip
Update QEMU_TAG
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Config.mk b/Config.mk
index 1cf4c5132b..6be7c20905 100644
--- a/Config.mk
+++ b/Config.mk
@@ -208,9 +208,9 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= 65b27b1dd6f205835aa8174031eea057c75f8afb
-# Thu Dec 1 18:23:34 2011 +0000
-# qemu-xen: passthrough, add PT_LOG_DEV
+QEMU_TAG ?= 68af5b5191593223709680b89951dfc84a32bee8
+# Mon Dec 5 13:43:34 2011 +0000
+# qemu_timer_pending/qemu_get_timer: cope with NULL timers
# Short answer -- do not enable this unless you know what you are
# doing and are prepared for some pain.