aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-05-14 17:15:36 +0100
committerIan Campbell <ian.campbell@citrix.com>2012-05-14 17:15:36 +0100
commitdebddaa56c84f5809774f34fdd190bc5f4a6cf16 (patch)
treeda59df5612d82de5a163d67c7f9e4b3d86d84fe3 /Config.mk
parent633979eeb74ecf9200a2f86eff9ed3f09c12bea9 (diff)
downloadxen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.gz
xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.bz2
xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.zip
nstore: rename public xenstore headers
The xenstore header xs.h is producing conflicts with other software[1]. xs is a too short identifier and does not matche the library. Renaming the headers to xenstore.h and xenstore_lib.h is the easiest way to make them easy recognizable and prevent furthe problems. [1]: http://bugs.debian.org/668550 [ Also update QEMU_TAG, to bring in corresponding change to qemu-xen-traditional. -iwj ] Signed-off-by: Bastian Blank <waldi@debian.org> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com> --HG-- rename : tools/xenstore/xs.h => tools/xenstore/xenstore.h rename : tools/xenstore/xs_lib.h => tools/xenstore/xenstore_lib.h
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 24883134d7..7d4e0a34a9 100644
--- a/Config.mk
+++ b/Config.mk
@@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= b7469189669c4de0a5161a869f443738d84539ec
-# Fri May 11 12:40:42 2012 +0100
-# passthrough: Intel GPU passthrough, fix OpRegion mapping
+QEMU_TAG ?= 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445
+# Mon May 14 17:05:48 2012 +0100
+# xenstore: Use <xenstore.h>
# Short answer -- do not enable this unless you know what you are
# doing and are prepared for some pain.