* [PATCH 4.6] Config: Switch to unified qemu trees.
@ 2015-11-18 16:06 Ian Jackson
2015-11-18 16:17 ` Jan Beulich
2015-11-18 16:18 ` Ian Campbell
0 siblings, 2 replies; 6+ messages in thread
From: Ian Jackson @ 2015-11-18 16:06 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
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>
---
Config.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Config.mk b/Config.mk
index 659d94d..ac7332b 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-4.6-testing.git
-QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-testing.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-4.6-testing.git
-QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 4.6] Config: Switch to unified qemu trees.
2015-11-18 16:06 [PATCH 4.6] Config: Switch to unified qemu trees Ian Jackson
@ 2015-11-18 16:17 ` Jan Beulich
2015-11-18 16:18 ` Ian Campbell
1 sibling, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2015-11-18 16:17 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Ian Campbell
>>> On 18.11.15 at 17:06, <ian.jackson@eu.citrix.com> wrote:
> 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: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 4.6] Config: Switch to unified qemu trees.
2015-11-18 16:06 [PATCH 4.6] Config: Switch to unified qemu trees Ian Jackson
2015-11-18 16:17 ` Jan Beulich
@ 2015-11-18 16:18 ` Ian Campbell
2015-11-18 16:33 ` Ian Jackson
2015-11-18 17:11 ` Ian Jackson
1 sibling, 2 replies; 6+ messages in thread
From: Ian Campbell @ 2015-11-18 16:18 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Wed, 2015-11-18 at 16:06 +0000, Ian Jackson wrote:
> 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>
This looks like what my local backport got when I was developing this,
which I erroneously posted as the patch for unstable in [0] so:
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Are you going to apply this to 4.5 and older now too? Given the obvious
s/4.6/$X.$Y/g on this patch you may keep my ack on those too.
Ian.
[0] http://lists.xen.org/archives/html/xen-devel/2015-09/msg02160.html
> ---
> Config.mk | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Config.mk b/Config.mk
> index 659d94d..ac7332b 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-4.6-t
> esting.git
> -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-tes
> ting.git
> +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git
> +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditi
> onal.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-4.6-testing.git
> -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 4.6] Config: Switch to unified qemu trees.
2015-11-18 16:18 ` Ian Campbell
@ 2015-11-18 16:33 ` Ian Jackson
2015-11-18 17:11 ` Ian Jackson
1 sibling, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2015-11-18 16:33 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [PATCH 4.6] Config: Switch to unified qemu trees."):
> This looks like what my local backport got when I was developing this,
> which I erroneously posted as the patch for unstable in [0] so:
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Great, thanks.
> Are you going to apply this to 4.5 and older now too? Given the obvious
> s/4.6/$X.$Y/g on this patch you may keep my ack on those too.
Yes.
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 4.6] Config: Switch to unified qemu trees.
2015-11-18 16:18 ` Ian Campbell
2015-11-18 16:33 ` Ian Jackson
@ 2015-11-18 17:11 ` Ian Jackson
2015-11-18 17:18 ` Ian Campbell
1 sibling, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2015-11-18 17:11 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [PATCH 4.6] Config: Switch to unified qemu trees."):
> Are you going to apply this to 4.5 and older now too? Given the obvious
> s/4.6/$X.$Y/g on this patch you may keep my ack on those too.
Now done. There was some fiddliness around ~4.4. Hopefully the
results are right. I didn't do any build tests so we'll have to keep
an eye on the osstest output.
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 4.6] Config: Switch to unified qemu trees.
2015-11-18 17:11 ` Ian Jackson
@ 2015-11-18 17:18 ` Ian Campbell
0 siblings, 0 replies; 6+ messages in thread
From: Ian Campbell @ 2015-11-18 17:18 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, 2015-11-18 at 17:11 +0000, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH 4.6] Config: Switch to unified qemu
> trees."):
> > Are you going to apply this to 4.5 and older now too? Given the obvious
> > s/4.6/$X.$Y/g on this patch you may keep my ack on those too.
>
> Now done. There was some fiddliness around ~4.4.
The copy I got from xen-staging looked ok.
> Hopefully the
> results are right. I didn't do any build tests so we'll have to keep
> an eye on the osstest output.
Ack.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-18 17:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-18 16:06 [PATCH 4.6] Config: Switch to unified qemu trees Ian Jackson
2015-11-18 16:17 ` Jan Beulich
2015-11-18 16:18 ` Ian Campbell
2015-11-18 16:33 ` Ian Jackson
2015-11-18 17:11 ` Ian Jackson
2015-11-18 17:18 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).