From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 9 Jul 2008 10:05:26 +0000 (+0100)
Subject: Switching to merged (git) qemu by default
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14188^2~72
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=abcd574d95c479eab05e79a2ab6afaaa63a36888;p=xen.git

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 85bb50b841..2cb15d4be0 100644
--- 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