From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 3 Sep 2008 09:38:33 +0000 (+0100)
Subject: xend: move the call to XendDevices.destroy_device_state()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14111^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=87fd15ceee9c195f428f9e329b1c223bd17b275b;p=xen.git

xend: move the call to XendDevices.destroy_device_state()

This patch moves the call to XendDevices.destroy_device_state() to the
function _remove_domain. Previously only Xen-API calls were calling
the destroy_device_state() function.

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 8e20152a95..1e9b4b0a16 100644
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -481,6 +481,7 @@ 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.")
@@ -1094,7 +1095,6 @@ class XendDomain:
         dominfo.metrics.destroy()
         self._managed_domain_unregister(dominfo)
         self._remove_domain(dominfo)
-        XendDevices.destroy_device_state(dominfo)
         dominfo.destroy_xapi_device_instances()