Config: Switch to unified qemu trees.

Upstream qemu is now in qemu-xen.git and the trad fork is in
qemu-xen-traditional.git.

QEMU_UPSTREAM_REVISION is currently a tag and
QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are
required to those.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Conflicts:
	Config.mk
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
(cherry picked from commit 78833c04250416f1870c458309d3ac0e5cf915fd)

Conflicts:
	Config.mk
(cherry picked from commit 0cabed0a0b322fbef30f3519465538df4ab1d9f2)

Conflicts:
	Config.mk
(cherry picked from commit 602506b3efa8ddeae2976ec9f15d91366f823919)

Conflicts:
	Config.mk

diff --git a/Config.mk b/Config.mk
index 0aaed5f44b04c68ebb0dcc6c052f22e6a75986fa..10bd71ce511ccf704c28c69e4d530556a9029114 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -197,18 +197,18 @@ XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles
 # near the place in the Xen Makefiles where the file is used.
 
 ifeq ($(GIT_HTTP),y)
-QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-4.3-testing.git
+QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git
 else
-QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-4.3-testing.git
+QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-traditional.git
 endif
 
 ifeq ($(GIT_HTTP),y)
 OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git
-QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.3-testing.git
+QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git
 SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
 else
 OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
-QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git
+QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871