From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 25 Jul 2008 12:58:23 +0000 (+0100)
Subject: xend: fix dual destroy
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14165^2~115
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cead514ad859ee4fdfe3d56a1585bd9f27c3d684;p=xen.git

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>
---

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()