aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-07-03 10:44:13 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-07-03 10:44:13 +0100
commit554a3a3375a568ba3fc44816ddf8e5568d7944a3 (patch)
treed748f16618a599abe64b04ba1487d1bc3992d7cb /Config.mk
parent8e65d32968c334f36093513b7c99ce4fa8e38106 (diff)
downloadxen-554a3a3375a568ba3fc44816ddf8e5568d7944a3.tar.gz
xen-554a3a3375a568ba3fc44816ddf8e5568d7944a3.tar.bz2
xen-554a3a3375a568ba3fc44816ddf8e5568d7944a3.zip
Support building of out-of-tree merged qemu from git
This provides support for building the new merged qemu from qemu-xen.git, or from a local checkout. The default is still to use the in-tree version, because the patchman infrastructure for testing, and propagation from staging to xen-unstable, needs a small amount of work to cope with git. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/Config.mk b/Config.mk
index 01ed02bd6a..85bb50b841 100644
--- a/Config.mk
+++ b/Config.mk
@@ -78,6 +78,14 @@ XSM_ENABLE ?= n
FLASK_ENABLE ?= n
ACM_SECURITY ?= n
+QEMU_REMOTE=http://www.chiark.greenend.org.uk/~ijackson/qemu-xen.git
+
+# Specify which qemu-dm to use. This may be `ioemu' to use the old
+# Mercurial in-tree version, or a local directory, or a git URL.
+CONFIG_QEMU ?= ioemu
+# CONFIG_QEMU ?= ../qemu-xen.git
+# CONFIG_QEMU ?= $(QEMU_REMOTE)
+
# Optional components
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n