[PATCH] Update QEMU_UPSTREAM_REVISION

[PATCH] Update QEMU_UPSTREAM_REVISION

[Anthony PERARD]

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
the commit sha correspond to the last tree that pass the qemu-xen push
gate (master).

Should we change this value to master once a release is done, during the
developpement phase?
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 7eeed31..4a74a33 100644
--- a/Config.mk
+++ b/Config.mk
@@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= a93b0e3f6895a074b99c8817181dfa6dbc7a4807
-QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c
+QEMU_UPSTREAM_REVISION ?= b97307ecaad98360f41ea36cd9674ef810c4f8cf
 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
 # Fri Aug 2 14:12:09 2013 -0400
 # Fix bug in CBFS file walking with compressed files.
-- 
Anthony PERARD

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Jackson]

Anthony PERARD writes ("[PATCH] Update QEMU_UPSTREAM_REVISION"):
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> the commit sha correspond to the last tree that pass the qemu-xen push
> gate (master).
> 
> Should we change this value to master once a release is done, during the
> developpement phase?

Perhaps we should change it to master now.  That way if further
updates are made to the tree, and pass the push gate, they will be
included.  Which is surely the intent ?

Ian.

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Campbell]

On Wed, 2013-11-27 at 17:17 +0000, Ian Jackson wrote:
> Anthony PERARD writes ("[PATCH] Update QEMU_UPSTREAM_REVISION"):
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > ---
> > the commit sha correspond to the last tree that pass the qemu-xen push
> > gate (master).
> > 
> > Should we change this value to master once a release is done, during the
> > developpement phase?
> 
> Perhaps we should change it to master now.  That way if further
> updates are made to the tree, and pass the push gate, they will be
> included.  Which is surely the intent ?

It looks like it was "master" until 4de97462d34f when it was updated to
"qemu-xen-4.3.0-rc1" (presumably in anticipation of branching or
releasing the rc) then it was turned into a sha at 1fee00908ae9 -- which
I think was likely to have been in error.

I agree that at least during the development phases it should be
"master".

It should probably be a tag for a release, including rcs, so that they
refer to a single consistent thing.

Given our policy of branching in the later rcs I'm not sure how we can
deal with this other than as we attempted last time by committing
something other than "master" to xen.git:Config.mk and remembering what
to do to put it back later afterwards. (or by revisiting the branching
policy, but I don't think this issue is reason enough to change).

Ian.

[PATCH] Update QEMU_UPSTREAM_REVISION

[Anthony PERARD]

Changing to master, otherwise we don't get the last updates.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
change since previous patch:
  - use master instead of a specific commit id
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 7eeed31..ce20844 100644
--- a/Config.mk
+++ b/Config.mk
@@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= a93b0e3f6895a074b99c8817181dfa6dbc7a4807
-QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c
+QEMU_UPSTREAM_REVISION ?= master
 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
 # Fri Aug 2 14:12:09 2013 -0400
 # Fix bug in CBFS file walking with compressed files.
-- 
Anthony PERARD

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Campbell]

On Thu, 2013-11-28 at 19:44 +0000, Anthony PERARD wrote:
> Changing to master, otherwise we don't get the last updates.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

WRT the release this patch is equivalent to "we should move to qemu
1.6". Did that get an exception already / is it on the list?

(please don't forget to CC George at this stage in the release for his
Ack, or to reference an existing release ack he gave)

> ---
> change since previous patch:
>   - use master instead of a specific commit id
> ---
>  Config.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Config.mk b/Config.mk
> index 7eeed31..ce20844 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
>  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
>  endif
>  OVMF_UPSTREAM_REVISION ?= a93b0e3f6895a074b99c8817181dfa6dbc7a4807
> -QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c
> +QEMU_UPSTREAM_REVISION ?= master
>  SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
>  # Fri Aug 2 14:12:09 2013 -0400
>  # Fix bug in CBFS file walking with compressed files.

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[George Dunlap]

On 11/29/2013 10:52 AM, Ian Campbell wrote:
> On Thu, 2013-11-28 at 19:44 +0000, Anthony PERARD wrote:
>> Changing to master, otherwise we don't get the last updates.
>>
>> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> WRT the release this patch is equivalent to "we should move to qemu
> 1.6". Did that get an exception already / is it on the list?
>
> (please don't forget to CC George at this stage in the release for his
> Ack, or to reference an existing release ack he gave)

Actually, isn't this "Fix incorrect assignment of a specific revision 
instead of most-recently-passed for development branch"? It's the push 
into the qemu tree that would require a release ack, but that happened a 
month ago before the code freeze IIRC.

  -George

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Campbell]

On Mon, 2013-12-02 at 11:30 +0000, George Dunlap wrote:
> On 11/29/2013 10:52 AM, Ian Campbell wrote:
> > On Thu, 2013-11-28 at 19:44 +0000, Anthony PERARD wrote:
> >> Changing to master, otherwise we don't get the last updates.
> >>
> >> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> >
> > WRT the release this patch is equivalent to "we should move to qemu
> > 1.6". Did that get an exception already / is it on the list?
> >
> > (please don't forget to CC George at this stage in the release for his
> > Ack, or to reference an existing release ack he gave)
> 
> Actually, isn't this "Fix incorrect assignment of a specific revision 
> instead of most-recently-passed for development branch"? It's the push 
> into the qemu tree that would require a release ack, but that happened a 
> month ago before the code freeze IIRC.

The concern was that we weren't testing the result of that push yet and
that this change would be in effect merging that code into the main
tree, which ought to at least be done with the release manager's
awareness.

However it turns out that OSStest uses the latest qemu push gate
regardless of Config.mk -- which changes the equation somewhat -- we
should obviously update Config.mk to what we are testing.

Ian.

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Jackson]

George Dunlap writes ("Re: [PATCH] Update QEMU_UPSTREAM_REVISION"):
> Actually, isn't this "Fix incorrect assignment of a specific revision 
> instead of most-recently-passed for development branch"? It's the push 
> into the qemu tree that would require a release ack, but that happened a 
> month ago before the code freeze IIRC.

Yes, I think so.

Ian.

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Campbell]

On Mon, 2013-12-02 at 12:34 +0000, Ian Jackson wrote:
> George Dunlap writes ("Re: [PATCH] Update QEMU_UPSTREAM_REVISION"):
> > Actually, isn't this "Fix incorrect assignment of a specific revision 
> > instead of most-recently-passed for development branch"? It's the push 
> > into the qemu tree that would require a release ack, but that happened a 
> > month ago before the code freeze IIRC.
> 
> Yes, I think so.

I've applied Anthony's patch to switch to master.

[PATCH] Update QEMU_UPSTREAM_REVISION

[Ian Jackson]

We should have done this a few days ago really.

I am about to push this to master (not staging!) and then merge it
into staging.  If the push gate gets a pass in the intervening time,
it will fail to push due to lack of fast-forward.

Ian.

Subject: [PATCH] Update QEMU_UPSTREAM_REVISION

Switch to specific tag, for 4.4.0 RC1 release.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Config.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 2007b22..ba4087f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
-QEMU_UPSTREAM_REVISION ?= master
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1
 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
 # Fri Aug 2 14:12:09 2013 -0400
 # Fix bug in CBFS file walking with compressed files.
-- 
1.7.10.4

[PATCH] Update QEMU_UPSTREAM_REVISION

[Stefano Stabellini]

Switch back to master.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 55dce20..484cfdb 100644
--- a/Config.mk
+++ b/Config.mk
@@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1
+QEMU_UPSTREAM_REVISION ?= master
 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
 # Fri Aug 2 14:12:09 2013 -0400
 # Fix bug in CBFS file walking with compressed files.

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[George Dunlap]

On 01/28/2014 03:23 PM, Stefano Stabellini wrote:
> Switch back to master.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

I don't think this needs an ack; switching back should be part of the 
normal process of cutting the RC.

  -George

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Konrad Rzeszutek Wilk]

On Tue, Jan 28, 2014 at 03:23:19PM +0000, Stefano Stabellini wrote:
> Switch back to master.

Could you say why please?
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 
> diff --git a/Config.mk b/Config.mk
> index 55dce20..484cfdb 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
>  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
>  endif
>  OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
> -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1
> +QEMU_UPSTREAM_REVISION ?= master
>  SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
>  # Fri Aug 2 14:12:09 2013 -0400
>  # Fix bug in CBFS file walking with compressed files.
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Stefano Stabellini]

On Tue, 28 Jan 2014, Konrad Rzeszutek Wilk wrote:
> On Tue, Jan 28, 2014 at 03:23:19PM +0000, Stefano Stabellini wrote:
> > Switch back to master.
> 
> Could you say why please?

See this thread: http://marc.info/?l=xen-devel&m=139090192108528

This should just be an automatic commit (that at the moment
unfortunately is manual) to switch the xen build system to clone the
master branch of qemu-xen instead of the RC1 tag.
Obviously we switch to cloning the RC1 tag for the RC1 release. However
now that RC1 is over we should go back to master.

> > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > 
> > diff --git a/Config.mk b/Config.mk
> > index 55dce20..484cfdb 100644
> > --- a/Config.mk
> > +++ b/Config.mk
> > @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
> >  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
> >  endif
> >  OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
> > -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1
> > +QEMU_UPSTREAM_REVISION ?= master
> >  SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
> >  # Fri Aug 2 14:12:09 2013 -0400
> >  # Fix bug in CBFS file walking with compressed files.
> > 
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xen.org
> > http://lists.xen.org/xen-devel
> 

Re: [PATCH] Update QEMU_UPSTREAM_REVISION

[Konrad Rzeszutek Wilk]

On Tue, Jan 28, 2014 at 04:09:13PM +0000, Stefano Stabellini wrote:
> On Tue, 28 Jan 2014, Konrad Rzeszutek Wilk wrote:
> > On Tue, Jan 28, 2014 at 03:23:19PM +0000, Stefano Stabellini wrote:
> > > Switch back to master.
> > 
> > Could you say why please?
> 
> See this thread: http://marc.info/?l=xen-devel&m=139090192108528

Just read it after I sent this email out :-)

I was thinking that the commit message should have at least
some description. Like 'Because we are going for rc2 and
its time to test new code' or 'rc1 tag had bugs, rc2 does
not.'


> 
> This should just be an automatic commit (that at the moment
> unfortunately is manual) to switch the xen build system to clone the
> master branch of qemu-xen instead of the RC1 tag.
> Obviously we switch to cloning the RC1 tag for the RC1 release. However
> now that RC1 is over we should go back to master.

Or for the pre-rc2 tag.

> 
> > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > 
> > > diff --git a/Config.mk b/Config.mk
> > > index 55dce20..484cfdb 100644
> > > --- a/Config.mk
> > > +++ b/Config.mk
> > > @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
> > >  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
> > >  endif
> > >  OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
> > > -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1
> > > +QEMU_UPSTREAM_REVISION ?= master
> > >  SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
> > >  # Fri Aug 2 14:12:09 2013 -0400
> > >  # Fix bug in CBFS file walking with compressed files.
> > > 
> > > _______________________________________________
> > > Xen-devel mailing list
> > > Xen-devel@lists.xen.org
> > > http://lists.xen.org/xen-devel
> >