# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1222866437 -3600
# Node ID ab19284c5070b8603a89bb757eff77b4420d1925
# Parent 616eea24aefac919d0baf94a41cbef6424564bf5
xend: Fixes after backend xenstore config changes.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/python/xen/xend/XendDomainInfo.py | 6 +++---
tools/python/xen/xend/image.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff -r 616eea24aefa -r ab19284c5070 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Wed Oct 01 13:35:39 2008 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py Wed Oct 01 14:07:17 2008 +0100
@@ -1208,8 +1208,6 @@ class XendDomainInfo:
return xstransact.Write(self.vmpath, *args)
def _removeVm(self, *args):
- if len(args) == 0:
- self._removeVmPath()
return xstransact.Remove(self.vmpath, *args)
def _gatherVm(self, *args):
@@ -1778,6 +1776,7 @@ class XendDomainInfo:
self._releaseDevices()
# Remove existing vm node in xenstore
self._removeVm()
+ self._removeVmPath()
new_dom_info = self.info.copy()
new_dom_info['name_label'] = self.info['name_label']
new_dom_info['uuid'] = self.info['uuid']
@@ -2358,7 +2357,7 @@ class XendDomainInfo:
paths = self._prepare_phantom_paths()
- self._cleanupVm()
+ self._removeVmPath()
if self.dompath is not None:
try:
xc.domain_destroy_hook(self.domid)
@@ -2375,6 +2374,7 @@ class XendDomainInfo:
self.cleanupDomain()
self._cleanup_phantom_devs(paths)
+ self._cleanupVm()
if "transient" in self.info["other_config"] \
and bool(self.info["other_config"]["transient"]):
diff -r 616eea24aefa -r ab19284c5070 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Wed Oct 01 13:35:39 2008 +0100
+++ b/tools/python/xen/xend/image.py Wed Oct 01 14:07:17 2008 +0100
@@ -502,7 +502,7 @@ class ImageHandler:
if fifo_fd >= 0:
self._openSentinel(sentinel_path_fifo)
os.close(fifo_fd)
- self.pid = self.vm.gatherVm(('image/device-model-pid', int))
+ self.pid = self.vm._gatherVm(('image/device-model-pid', int))
log.debug("%s device model rediscovered, pid %s sentinel fifo %s",
name, self.pid, sentinel_path_fifo)
self.sentinel_thread =
thread.start_new_thread(self._sentinel_watch,())
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home