# HG changeset patch
# User Brendan Cully <brendan@xxxxxxxxx>
# Date 1253584504 25200
# Node ID e9965de05705739487036b00039b8a7ee6ac5df5
# Parent  72d130772f36284b904da2369410de795237f712
Update Makefile to allow use of hg ioemu mirror.

HG vs ioemu is controlled by setting QEMU_GIT to y or n.

diff --git a/Config.mk b/Config.mk
--- a/Config.mk
+++ b/Config.mk
@@ -142,18 +142,31 @@
 # near the place in the Xen Makefiles where the file is used.
 
 # GIT protocol can be faster than HTTP, if your firewall lets it through.
-# QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git
-QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
+QEMU_GITURL=git://xenbits.xensource.com/qemu-xen-unstable.git
+QEMU_HGURL ?= http://xenbits.xensource.com/ext/qemu-xen-unstable.hg
+
+# set to y to use the git tree
+QEMU_GIT ?= n
 
 # 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.
+# Mercurial in-tree version, or a local directory, or an HG URL,
+# or a git URL if QEMU_GIT is y
 # CONFIG_QEMU ?= ../qemu-xen.git
+ifeq (y,$(QEMU_GIT))
+  QEMU_REMOTE ?= $(QEMU_GITURL)
+else
+  QEMU_REMOTE ?= $(QEMU_HGURL)
+endif
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG ?= 3de6cb51b19c46967cbc88ceb202b240c736eeca
+QEMU_GIT_TAG ?= 3de6cb51b19c46967cbc88ceb202b240c736eeca
 # Fri Sep 11 18:34:25 2009 +0100
 # Merge branch 'latara'
 
+QEMU_HG_TAG ?= 586c7b21b88a
+# Fri Sep 04 16:21:25 2009 +0100
+# graphics passthrough with VT-d
+
 OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg
 
 # Build OCAML version of xenstored instead of the in-tree C version?
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -13,8 +13,9 @@
 MSGFMT     = msgfmt
 MSGMERGE   = msgmerge
 
-# Allow git to be wrappered in the environment
+# Allow git/hg to be wrappered in the environment
 GIT        ?= git
+HG	   ?= hg
 
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755 -p
diff --git a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -84,13 +84,20 @@
 		if [ ! -d ioemu-remote ]; then \
 			rm -rf ioemu-remote ioemu-remote.tmp; \
 			mkdir ioemu-remote.tmp; rmdir ioemu-remote.tmp; \
-			$(GIT) clone $(CONFIG_QEMU) ioemu-remote.tmp; \
-			if [ "$(QEMU_TAG)" ]; then			\
-				cd ioemu-remote.tmp;			\
-				$(GIT) branch -D dummy >/dev/null 2>&1 ||:; \
-				$(GIT) checkout -b dummy $(QEMU_TAG);	\
-				cd ..;					\
-			fi;						\
+			if [ "$(QEMU_GIT)" = y ]; then \
+				$(GIT) clone $(CONFIG_QEMU) ioemu-remote.tmp; \
+				if [ "$(QEMU_GIT_TAG)" ]; then			\
+					cd ioemu-remote.tmp;			\
+					$(GIT) branch -D dummy >/dev/null 2>&1 ||:; \
+					$(GIT) checkout -b dummy $(QEMU_GIT_TAG); \
+					cd ..;					\
+				fi;						\
+			else 							\
+				$(HG) clone $(CONFIG_QEMU) ioemu-remote.tmp;	\
+				if [ "$(QEMU_HG_TAG)" ]; then 			\
+					$(HG) -R ioemu-remote.tmp update $(QEMU_HG_TAG); \
+				fi;						\
+			fi; \
 			mv ioemu-remote.tmp ioemu-remote; \
 		fi; \
 		rm -f ioemu-dir; \