please pull xenppc-unstable-merge.hg

please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

Hi Keir, please pull from
http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg

I finally have beaten the domain builder into shape, which required a
moving some x86 and ia64 code around. I've also fixed a few other build
and runtime bugs that came down from recent xen-unstable changes.

Separate topic:

At this point, all PowerPC code is merged up. Because I was importing
changesets from xenppc-unstable into xenppc-unstable-merge by hand,
there's a bunch of old history left in xenppc-unstable. I would like to
merge that in. The following commands executed in xen-unstable should do
the right thing:
        hg tip
        hg pull http://xenbits.xensource.com/ext/xenppc-unstable.hg
        HGMERGE=/bin/true hg -y merge
        hg revert -a <old tip>
        hg commit

It looks like that will bring in about 775 changesets without changing
any code, but that's the amount of work you would have gotten all along;
it's just coming in all at once (flooding xen-changelog). Also, not all
of them have proper DCO lines. What do you think?

(In general, I will say that manually importing selected changesets from
a "development" tree into a "merge" tree was a bad idea, and I would be
happy to elaborate for anybody who is considering this model.)

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: please pull xenppc-unstable-merge.hg

[Keir Fraser]

On 21/3/07 23:48, "Hollis Blanchard" <hollisb@us.ibm.com> wrote:

> Hi Keir, please pull from
> http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg

Done.

> It looks like that will bring in about 775 changesets without changing
> any code, but that's the amount of work you would have gotten all along;
> it's just coming in all at once (flooding xen-changelog). Also, not all
> of them have proper DCO lines. What do you think?

I think you should have a flag day for all ppc developers where you export
any patches that you want to keep that aren't in xen-unstable, throw away
xenppc-unstable, and rebase to xen-unstable.

 -- Keir

please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

Hi Keir, could you please pull from
http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg ?

There are two patches that touch common code:
      * Add a guest_physmap hook for max_mem changes. We've finally
        gotten around to removing a hack we've carried in the PowerPC
        tree for a while and we're using the guest_physmap_* hooks
        instead. At least for now we're using an array for p2m
        translation, and that means we need to know how big to make it.
      * Yamahata-san's PowerPC dynamic grant table patch. It looked a
        little hairy to me, but when I sat down with it I couldn't
        figure out how to improve it, at least until PowerPC gets rid of
        some assumptions about MFN locations.

Thanks!

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

On Fri, 2007-03-02 at 17:52 -0600, Hollis Blanchard wrote:
> Hi Keir, could you please pull from
> http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg ?
> 
> There are two patches that touch common code:
>       * Add a guest_physmap hook for max_mem changes. We've finally
>         gotten around to removing a hack we've carried in the PowerPC
>         tree for a while and we're using the guest_physmap_* hooks
>         instead. At least for now we're using an array for p2m
>         translation, and that means we need to know how big to make it.
>       * Yamahata-san's PowerPC dynamic grant table patch. It looked a
>         little hairy to me, but when I sat down with it I couldn't
>         figure out how to improve it, at least until PowerPC gets rid of
>         some assumptions about MFN locations.

I had accidentally added a file in xen/include/asm (instead of
asm-powerpc), which made asm a directory and broke the symlink creation.
I've fixed that now.

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: please pull xenppc-unstable-merge.hg

[Keir Fraser]

The xenppc-unstable is already merged and fixed.

 -- Keir


On 5/3/07 19:24, "Hollis Blanchard" <hollisb@us.ibm.com> wrote:

>> There are two patches that touch common code:
>>       * Add a guest_physmap hook for max_mem changes. We've finally
>>         gotten around to removing a hack we've carried in the PowerPC
>>         tree for a while and we're using the guest_physmap_* hooks
>>         instead. At least for now we're using an array for p2m
>>         translation, and that means we need to know how big to make it.
>>       * Yamahata-san's PowerPC dynamic grant table patch. It looked a
>>         little hairy to me, but when I sat down with it I couldn't
>>         figure out how to improve it, at least until PowerPC gets rid of
>>         some assumptions about MFN locations.
> 
> I had accidentally added a file in xen/include/asm (instead of
> asm-powerpc), which made asm a directory and broke the symlink creation.
> I've fixed that now.

please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

Hi Keir, please pull from
http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg

Among the PPC updates are the two libelf patches I sent separately.

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

On Fri, 2007-02-09 at 14:58 -0600, Hollis Blanchard wrote:
> Hi Keir, please pull from
> http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg
> 
> Among the PPC updates are the two libelf patches I sent separately.

Hi Keir, any comments on this?

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: please pull xenppc-unstable-merge.hg

[Keir Fraser]

On 14/2/07 16:44, "Hollis Blanchard" <hollisb@us.ibm.com> wrote:

> On Fri, 2007-02-09 at 14:58 -0600, Hollis Blanchard wrote:
>> Hi Keir, please pull from
>> http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg
>> 
>> Among the PPC updates are the two libelf patches I sent separately.
> 
> Hi Keir, any comments on this?

Assuming all looks okay I'll merge the ppc tree in tomorrow morning.

Can I delete the old elf code after doing this merge (i.e., are you using
libelf now)?

 -- Keir

Re: please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

On Wed, 2007-02-14 at 18:55 +0000, Keir Fraser wrote:
> On 14/2/07 16:44, "Hollis Blanchard" <hollisb@us.ibm.com> wrote:
> 
> > On Fri, 2007-02-09 at 14:58 -0600, Hollis Blanchard wrote:
> >> Hi Keir, please pull from
> >> http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg
> >> 
> >> Among the PPC updates are the two libelf patches I sent separately.
> > 
> > Hi Keir, any comments on this?
> 
> Assuming all looks okay I'll merge the ppc tree in tomorrow morning.

Great, thanks!

> Can I delete the old elf code after doing this merge (i.e., are you using
> libelf now)?

Yes, we are using libelf now.

-- 
Hollis Blanchard
IBM Linux Technology Center

please pull xenppc-unstable-merge.hg

[Hollis Blanchard]

Hi Keir, please pull from xenppc-unstable-merge.hg. The big changes are:
- fixed memory deallocation so we can actually destroy domUs now
- support console=comX for the Xen console (important for one of our
platforms)

 arch/powerpc/Makefile             |    8 +++---
 arch/powerpc/boot_of.c            |   49 ++++++++++++++++++++++----------------
 arch/powerpc/domain.c             |   49 ++++++++++++++++++++------------------
 arch/powerpc/domain_build.c       |    6 ++--
 arch/powerpc/htab.c               |   13 ++++------
 arch/powerpc/mm.c                 |   22 ++++++++++++++---
 arch/powerpc/ofd_fixup.c          |    8 +++---
 arch/powerpc/papr/xlate.c         |    2 +
 arch/powerpc/powerpc64/ppc970.c   |    7 +++--
 arch/powerpc/setup.c              |   41 ++++++++++++++++++++-----------
 include/asm-powerpc/config.h      |    1
 include/asm-powerpc/domain.h      |   15 ++++++-----
 include/asm-powerpc/grant_table.h |    2 -
 include/asm-powerpc/htab.h        |    8 ++----
 include/asm-powerpc/mm.h          |    2 -
 include/asm-powerpc/shadow.h      |   15 ++++++++++-
 16 files changed, 155 insertions(+), 93 deletions(-)

-- 
Hollis Blanchard
IBM Linux Technology Center