On Mon, 2006-08-21 at 14:43 -0500, Hollis Blanchard wrote:
> > diff -r b1fd0275383b -r 6b9124f9d89d tools/python/xen/xend/image.py
> > --- a/tools/python/xen/xend/image.py        Sun Aug 20 13:00:31 2006 -0400
> > +++ b/tools/python/xen/xend/image.py        Sun Aug 20 13:02:16 2006 -0400
> > @@ -197,6 +197,10 @@ class PPC_LinuxImageHandler(LinuxImageHa
> >      def configure(self, imageConfig, deviceConfig):
> >          LinuxImageHandler.configure(self, imageConfig, deviceConfig)
> >          self.imageConfig = imageConfig
> > +
> > +    def getDomainMemory(self, mem_kb):
> > +        """@see ImageHandler.getDomainMemory"""
> > +        return mem_kb
> >  
> >      def buildDomain(self):
> >          store_evtchn = self.vm.getStorePort()
> 
> Sorry, but this is the result of another mis-merge. I will try to
> repair...

I should add this isn't really your fault. The "shadow2" code clobbered
some of my xend architecture code (which isn't merged already because
Ewan seems to be occupied elsewhere). It will require some untangling.

-- 
Hollis Blanchard
IBM Linux Technology Center


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

Reply via email to