[Xen-changelog] [xen-unstable] Revert 20221:fc94d586d02f

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1253281540 -3600
# Node ID 3a71e070e3c5681d4394c943b6b0a17e8dab1720
# Parent  50acb4dff678bb94dbb20bd092138f2d816d4c05
Revert 20221:fc94d586d02f

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/XendDomain.py     |    2 --
 tools/python/xen/xend/XendDomainInfo.py |   12 ------------
 2 files changed, 14 deletions(-)

diff -r 50acb4dff678 -r 3a71e070e3c5 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Fri Sep 18 08:46:32 2009 +0100
+++ b/tools/python/xen/xend/XendDomain.py       Fri Sep 18 14:45:40 2009 +0100
@@ -347,7 +347,6 @@ class XendDomain:
             if self.is_domain_managed(dom):
                 self._managed_config_remove(dom.get_uuid())
                 del self.managed_domains[dom.get_uuid()]
-                dom.unlink_xapi_instances()
                 dom.destroy_xapi_instances()
         except ValueError:
             log.warn("Domain is not registered: %s" % dom.get_uuid())
@@ -486,7 +485,6 @@ class XendDomain:
             if domid in self.domains:
                 del self.domains[domid]
 
-            info.unlink_xapi_instances()
             info.destroy_xapi_instances()
         else:
             log.warning("Attempted to remove non-existent domain.")
diff -r 50acb4dff678 -r 3a71e070e3c5 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Fri Sep 18 08:46:32 2009 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Fri Sep 18 14:45:40 2009 +0100
@@ -4043,18 +4043,6 @@ class XendDomainInfo:
             except Exception, exn:
                 raise XendError('Failed to destroy device')
 
-    def unlink_xapi_instances(self):
-        from xen.xend import XendDomain
-        if XendDomain.instance().is_valid_vm(self.info.get('uuid')):
-            # domain still exists.
-            return
-
-        for vbd_ref in self.info.get('vbd_refs'):
-            dev_info = self.info['devices'].get(vbd_ref)[1]
-            vdi = XendNode.instance().get_vdi_by_uuid(dev_info['VDI'])
-            if vdi.getVBDs().count(vbd_ref):
-                vdi.removeVBD(vbd_ref)
-
     def destroy_xapi_instances(self):
         """Destroy Xen-API instances stored in XendAPIStore.
         """

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog