[PATCH] [xend] Revert CS 18415

[PATCH] [xend] Revert CS 18415

[Stefan Berger]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

I need to revert changeset 18415, since it causes more problems than it
solves for the non Xen-API mode.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>


[-- Attachment #2: revert_18415.diff --]
[-- Type: text/x-patch, Size: 829 bytes --]

Index: root/xen-unstable.hg/tools/python/xen/xend/XendDomain.py
===================================================================
--- root.orig/xen-unstable.hg/tools/python/xen/xend/XendDomain.py
+++ root/xen-unstable.hg/tools/python/xen/xend/XendDomain.py
@@ -481,7 +481,6 @@ class XendDomain:
             if domid in self.domains:
                 del self.domains[domid]
 
-            XendDevices.destroy_device_state(info)
             info.destroy_xapi_device_instances()
         else:
             log.warning("Attempted to remove non-existent domain.")
@@ -1095,6 +1094,7 @@ class XendDomain:
         dominfo.metrics.destroy()
         self._managed_domain_unregister(dominfo)
         self._remove_domain(dominfo)
+        XendDevices.destroy_device_state(info)
         dominfo.destroy_xapi_device_instances()
 
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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