aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-07-25 13:58:23 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-07-25 13:58:23 +0100
commitcead514ad859ee4fdfe3d56a1585bd9f27c3d684 (patch)
tree33120ceaacc30dc53e500dec1c0ef29195817e14
parentee7be8aa51e43c1ac0212f9f2c30282b1b7b002b (diff)
downloadxen-cead514ad859ee4fdfe3d56a1585bd9f27c3d684.tar.gz
xen-cead514ad859ee4fdfe3d56a1585bd9f27c3d684.tar.bz2
xen-cead514ad859ee4fdfe3d56a1585bd9f27c3d684.zip
xend: fix dual destroy
After changeset 18030 and 18064 were checked in, I found some issues when creating HVM domains with devices assigned. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--tools/python/xen/xend/XendDomainInfo.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 5052009158..82ee454787 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -2374,6 +2374,9 @@ class XendDomainInfo:
def destroy(self):
"""Cleanup VM and destroy domain. Nothrow guarantee."""
+ if self.domid is None:
+ return
+
log.debug("XendDomainInfo.destroy: domid=%s", str(self.domid))
paths = self._prepare_phantom_paths()