Merging 4.10.0-shim-comet-3 tag into staging-4.10

Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Wei Liu]

Hi all

I merged 4.10.0-shim-comet-3 tag into staging-4.10, went through all
commits since then and cherry-picked relevant patches from master to
staging-4.10.

The end result is:

  https://xenbits.xen.org/gitweb/?p=people/liuw/xen.git;a=shortlog;h=refs/heads/merge-comet-staging-4.10-v1

There is also a merge-comet-staging-4.10-v1-base tag.

The merge had trivial conflicts and I fixed it.

There are some notable things in the subsequent patches.

1. Revert "x86/guest: use the vcpu_info area from shared_info"

The bug fix is already in 4.10 branch so this workaround for comet is
not needed anymore.

2. xen/shim: stash RSDP address for ACPI driver

This isn't strictly necessary for 4.10 because the commiet that changes
the placement of RSDP is not in 4.10 libxl.

3. firmware/shim: update Makefile

This is a new patch to ease further cherry-picking for later commits.

Please check if the shape and form of this branch is OK. And please
indicate if anything is missing.

Building that branch seems to produce the expected binaries. I will do
some smoke tests tomorrow to make sure I haven't screwed things up.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Jan Beulich]

>>> On 05.03.18 at 20:44, <wei.liu2@citrix.com> wrote:
> I merged 4.10.0-shim-comet-3 tag into staging-4.10, went through all
> commits since then and cherry-picked relevant patches from master to
> staging-4.10.
> 
> The end result is:
> 
>   
> https://xenbits.xen.org/gitweb/?p=people/liuw/xen.git;a=shortlog;h=refs/heads/merge-comet-staging-4.10-v1
> 
> There is also a merge-comet-staging-4.10-v1-base tag.

Did you perhaps forget to push? I can't seem to see anything on
the branch, nor said tag.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Wei Liu]

On Tue, Mar 06, 2018 at 01:21:52AM -0700, Jan Beulich wrote:
> >>> On 05.03.18 at 20:44, <wei.liu2@citrix.com> wrote:
> > I merged 4.10.0-shim-comet-3 tag into staging-4.10, went through all
> > commits since then and cherry-picked relevant patches from master to
> > staging-4.10.
> > 
> > The end result is:
> > 
> >   
> > https://xenbits.xen.org/gitweb/?p=people/liuw/xen.git;a=shortlog;h=refs/heads/merge-comet-staging-4.10-v1
> > 
> > There is also a merge-comet-staging-4.10-v1-base tag.
> 
> Did you perhaps forget to push? I can't seem to see anything on
> the branch, nor said tag.
> 

Strange. The link above is for that branch. You can see the tag on that
page too.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Ian Jackson]

Wei Liu writes ("Merging 4.10.0-shim-comet-3 tag into staging-4.10"):
> Please check if the shape and form of this branch is OK. And please
> indicate if anything is missing.

The branch shape looks good to me.

> Building that branch seems to produce the expected binaries. I will do
> some smoke tests tomorrow to make sure I haven't screwed things up.

Thanks,
Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Jan Beulich]

>>> On 06.03.18 at 11:41, <wei.liu2@citrix.com> wrote:
> On Tue, Mar 06, 2018 at 01:21:52AM -0700, Jan Beulich wrote:
>> >>> On 05.03.18 at 20:44, <wei.liu2@citrix.com> wrote:
>> > I merged 4.10.0-shim-comet-3 tag into staging-4.10, went through all
>> > commits since then and cherry-picked relevant patches from master to
>> > staging-4.10.
>> > 
>> > The end result is:
>> > 
>> >   
>> > 
> https://xenbits.xen.org/gitweb/?p=people/liuw/xen.git;a=shortlog;h=refs/heads 
> /merge-comet-staging-4.10-v1
>> > 
>> > There is also a merge-comet-staging-4.10-v1-base tag.
>> 
>> Did you perhaps forget to push? I can't seem to see anything on
>> the branch, nor said tag.
>> 
> 
> Strange. The link above is for that branch. You can see the tag on that
> page too.

Oh, I'm sorry, I didn't look at the link. Instead I took "I merged
4.10.0-shim-comet-3 tag into staging-4.10" verbatim (which made
the link apparently redundant). I'll take a look, hopefully later today.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Wei Liu]

On Mon, Mar 05, 2018 at 07:44:49PM +0000, Wei Liu wrote:
> Building that branch seems to produce the expected binaries. I will do
> some smoke tests tomorrow to make sure I haven't screwed things up.

Travis build result is positive for both x86 and ARM (although ARM tools
aren't built yet).

Tested on two machines (one of which incapable of EPT): Creating PV /
PV-in-PVH guests worked, all relevant XTF test cases passed.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Jan Beulich]

>>> On 06.03.18 at 11:56, <ian.jackson@citrix.com> wrote:
> Wei Liu writes ("Merging 4.10.0-shim-comet-3 tag into staging-4.10"):
>> Please check if the shape and form of this branch is OK. And please
>> indicate if anything is missing.
> 
> The branch shape looks good to me.

Same here - feel free to push to the actual staging-4.10 (you'll need
to merge once more due to backports I've pushed earlier today).

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: Merging 4.10.0-shim-comet-3 tag into staging-4.10

[Wei Liu]

On Tue, Mar 06, 2018 at 09:14:50AM -0700, Jan Beulich wrote:
> >>> On 06.03.18 at 11:56, <ian.jackson@citrix.com> wrote:
> > Wei Liu writes ("Merging 4.10.0-shim-comet-3 tag into staging-4.10"):
> >> Please check if the shape and form of this branch is OK. And please
> >> indicate if anything is missing.
> > 
> > The branch shape looks good to me.
> 
> Same here - feel free to push to the actual staging-4.10 (you'll need
> to merge once more due to backports I've pushed earlier today).
> 

Now done.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel