Re: [XenPPC] heads up: large nasty merge

[Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>]

On Tue, Sep 05, 2006 at 06:04:54PM -0500, Hollis Blanchard wrote:
> I just committed a large nasty merge to xenppc-unstable and
> linux-ppc-2.6. You definitely need to pull both at once.
> 
> The big change is that dom0_ops was fragmented into separate hcalls, so
> if you don't update Linux with Xen you will get lots of "invalid
> argument" errors from every dom0_op hcall, which xend does an awful lot
> of.
> 
> I've built and booted a domU via xend, but it's possible something
> didn't get rebuilt or I missed a file to check in, so please let me know
> if you have problems.

I've failed to get the linux.hg tree to build.  xen.hg seems fine.
I made a few changes locally to try and keep things moving but I got
stuck.

Early on I get told that "arch-powerpc.h" doesn't exist, so I ran:
hg mv include/xen/interface/arch-ppc64.h include/xen/interface/arch-powerpc.h
Which helped.

With this is palce I get a little further in the build then I start to
get complaints about __XEN_INTERFACE_VERSION__ being redefined.  To work
around this I removed the:

#if !(defined(__XEN__) || defined(__XEN_TOOLS__))
/* not sure how this is supposed to get asserted */
#define __XEN_INTERFACE_VERSION__ 0x00030202
#endif

from the (new arch-powerpc.h) file.  and added:

diff -r 0d95131b439e arch/powerpc/Makefile
--- a/arch/powerpc/Makefile     Tue Sep 05 18:00:40 2006 -0500
+++ b/arch/powerpc/Makefile     Wed Sep 06 15:43:54 2006 +1000
@@ -60,6 +60,8 @@ endif
 
 LDFLAGS_vmlinux        := -Bstatic
 
+CPPFLAGS-$(CONFIG_XEN) += \
+       -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
 # The -Iarch/$(ARCH)/include is temporary while we are merging
 CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include
 AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)

[sorry a single patch isn't easy here as an hg rename is an delete+add,
 patching the new file just loses context :(]

At this point I end up with:

I get told include/xen/interface/{domctl,sysctl,platform}.h are missing.
Also hg manifest still tells me that include/xen/interface/dom0_ops.h still
exists.  I don't think I can trivially recreate these files so I stopped
here.

Hope this helps.

Yours Tony

   linux.conf.au       http://linux.conf.au/ || http://lca2007.linux.org.au/
   Jan 15-20 2007      The Australian Linux Technical Conference!


_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel