Switching to merged (git) qemu by default

The merged qemu tree is now on xenbits at:
   http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
(and a corresponding staging tree in /staging).

That's a raw git tree fetchable by `git-clone http://....', so not
really browseable.  There will be gitweb, and a real git server, set
up shortly, as well as a one-way Mercurial gateway.

The tools/ioemu subdirectory will remain in the xen-unstable tree for
this release, as an alternative.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 85bb50b8412d1787c1f9e15561abc11b36c2ff9f..2cb15d4be013244ad17a11d7f8c82e8812b55d3d 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -78,13 +78,13 @@ XSM_ENABLE ?= n
 FLASK_ENABLE ?= n
 ACM_SECURITY ?= n
 
-QEMU_REMOTE=http://www.chiark.greenend.org.uk/~ijackson/qemu-xen.git
+QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.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   ?= ioemu
 # CONFIG_QEMU   ?= ../qemu-xen.git
-# CONFIG_QEMU   ?= $(QEMU_REMOTE)
+CONFIG_QEMU   ?= $(QEMU_REMOTE)
 
 # Optional components
 XENSTAT_XENTOP     ?= y