Re: [Xen-devel] [PATCH XEN] Config: Switch to unified qemu trees.

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Thu, 2015-09-17 at 11:32 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH XEN] Config: Switch to unified qemu
> trees."):
> > Upstream qemu is not in qemu-xen.git and the trad fork is in
> > qemu-xen-traditional.h
> > 
> > QEMU_UPSTREAM_REVISION is currently a tag and
> > QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are
> > required to those.
> 
> When this is backported, something will have to be done about that, of
> course.  Otherwise stable branches might pick up qemu-*#master

Stable branches already have this switched out for a specific versioned tag
as part of the branching process, I believe.

> > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> > (cherry picked from commit dff5c395c1d23c21238ce17ddcd6f7abe2efd08d)
> > 
> > Conflicts:
> >     Config.mk
> 
> Did you intend that to appear here ?

No. In fact I ran git send-email with my staging-4.5 branch checked out
where I had been checking how noisey the cherry pick was etc. Sorry.

The proper commit for staging is below.

FWIW the cherry-pick conflicts because the branch has the different split
tree, just accepting the version from the cherry-picked patch is correct.

Ian.

From dff5c395c1d23c21238ce17ddcd6f7abe2efd08d Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Thu, 10 Sep 2015 14:31:34 +0100
Subject: [PATCH] Config: Switch to unified qemu trees.

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

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@xxxxxxxxxx>
---
 Config.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Config.mk b/Config.mk
index 59607b4..a371cd9 100644
--- a/Config.mk
+++ b/Config.mk
@@ -242,14 +242,14 @@ 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-unstable.git
-QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git
+QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git
+QEMU_TRADITIONAL_URL ?= 
http://xenbits.xen.org/git-http/qemu-xen-traditional.git
 SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
 MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git
 else
 OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
-QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
-QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git
+QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git
+QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel