1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Sun Sep 18 15:41:28 2005 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Sun Sep 18 15:50:12 2005 +0100
     1.3 @@ -339,7 +339,7 @@ class XendDomainInfo:
     1.4      def getSsidref(self):
     1.5          return self.ssidref
     1.6  
     1.7 -    def getTargetMemory(self):
     1.8 +    def getMemoryTarget(self):
     1.9          """Get this domain's target memory size, in MiB."""
    1.10          return self.memory
    1.11  

     2.1 --- a/tools/python/xen/xend/image.py	Sun Sep 18 15:41:28 2005 +0100
     2.2 +++ b/tools/python/xen/xend/image.py	Sun Sep 18 15:50:12 2005 +0100
     2.3 @@ -313,7 +313,7 @@ class VmxImageHandler(ImageHandler):
     2.4                             image          = self.kernel,
     2.5                             control_evtchn = self.device_channel.port2,
     2.6                             store_evtchn   = store_evtchn,
     2.7 -                           memsize        = self.vm.getTargetMemory(),
     2.8 +                           memsize        = self.vm.getMemoryTarget(),
     2.9                             memmap         = self.memmap_value,
    2.10                             cmdline        = self.cmdline,
    2.11                             ramdisk        = self.ramdisk,
    2.12 @@ -413,7 +413,7 @@ class VmxImageHandler(ImageHandler):
    2.13              args = args + vnc
    2.14          args = args + ([ "-d",  "%d" % self.vm.getDomain(),
    2.15                    "-p", "%d" % self.device_channel.port1,
    2.16 -                  "-m", "%s" % self.vm.getTargetMemory() ])
    2.17 +                  "-m", "%s" % self.vm.getMemoryTarget() ])
    2.18          args = args + self.dmargs
    2.19          env = dict(os.environ)
    2.20          env['DISPLAY'] = self.display

     3.1 --- a/tools/python/xen/xend/server/SrvDomainDir.py	Sun Sep 18 15:41:28 2005 +0100
     3.2 +++ b/tools/python/xen/xend/server/SrvDomainDir.py	Sun Sep 18 15:50:12 2005 +0100
     3.3 @@ -155,7 +155,7 @@ class SrvDomainDir(SrvDir):
     3.4                  req.write('<li><a href="%s%s"> Domain %s</a>'
     3.5                            % (url, d.getName(), d.getName()))
     3.6                  req.write('id=%s' % d.getDomain())
     3.7 -                req.write('memory=%d'% d.getTargetMemory())
     3.8 +                req.write('memory=%d'% d.getMemoryTarget())
     3.9                  req.write('ssidref=%d'% d.getSsidref())
    3.10                  req.write('</li>')
    3.11              req.write('</ul>')