Revert 18415:3e72ab517e44 (xend: move the call to XendDevices.destroy_device_state())

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

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 1e9b4b0a163b53b7423b010ada8ba58c4a9e0fda..8e20152a95a7d24f17789f4a50c71f89caaa4489 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/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(dominfo)
         dominfo.destroy_xapi_device_instances()