1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Wed Oct 01 13:35:39 2008 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Wed Oct 01 14:07:17 2008 +0100
     1.3 @@ -1208,8 +1208,6 @@ class XendDomainInfo:
     1.4          return xstransact.Write(self.vmpath, *args)
     1.5  
     1.6      def _removeVm(self, *args):
     1.7 -        if len(args) == 0:
     1.8 -            self._removeVmPath()
     1.9          return xstransact.Remove(self.vmpath, *args)
    1.10  
    1.11      def _gatherVm(self, *args):
    1.12 @@ -1778,6 +1776,7 @@ class XendDomainInfo:
    1.13          self._releaseDevices()
    1.14          # Remove existing vm node in xenstore
    1.15          self._removeVm()
    1.16 +        self._removeVmPath()
    1.17          new_dom_info = self.info.copy()
    1.18          new_dom_info['name_label'] = self.info['name_label']
    1.19          new_dom_info['uuid'] = self.info['uuid']
    1.20 @@ -2358,7 +2357,7 @@ class XendDomainInfo:
    1.21  
    1.22          paths = self._prepare_phantom_paths()
    1.23  
    1.24 -        self._cleanupVm()
    1.25 +        self._removeVmPath()
    1.26          if self.dompath is not None:
    1.27              try:
    1.28                  xc.domain_destroy_hook(self.domid)
    1.29 @@ -2375,6 +2374,7 @@ class XendDomainInfo:
    1.30              self.cleanupDomain()
    1.31  
    1.32          self._cleanup_phantom_devs(paths)
    1.33 +        self._cleanupVm()
    1.34  
    1.35          if "transient" in self.info["other_config"] \
    1.36             and bool(self.info["other_config"]["transient"]):

     2.1 --- a/tools/python/xen/xend/image.py	Wed Oct 01 13:35:39 2008 +0100
     2.2 +++ b/tools/python/xen/xend/image.py	Wed Oct 01 14:07:17 2008 +0100
     2.3 @@ -502,7 +502,7 @@ class ImageHandler:
     2.4          if fifo_fd >= 0:
     2.5              self._openSentinel(sentinel_path_fifo)
     2.6              os.close(fifo_fd)
     2.7 -            self.pid = self.vm.gatherVm(('image/device-model-pid', int))
     2.8 +            self.pid = self.vm._gatherVm(('image/device-model-pid', int))
     2.9              log.debug("%s device model rediscovered, pid %s sentinel fifo %s",
    2.10                      name, self.pid, sentinel_path_fifo)
    2.11              self.sentinel_thread = thread.start_new_thread(self._sentinel_watch,())