[Xen-changelog] [xen-unstable] Revert 21224:a7947fd90328 "xend: earlier remove the backend of tapdisk device"

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1272008239 -3600
# Node ID 7f3eff15050cc940fe68634a3b0e315e69b395e0
# Parent  2b97855a629f1d79e1d075a6d2a8b569018b2094
Revert 21224:a7947fd90328 "xend: earlier remove the backend of tapdisk device"

Consensus is that this is not the correct fix.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |    8 +-------
 1 files changed, 1 insertion(+), 7 deletions(-)

diff -r 2b97855a629f -r 7f3eff15050c tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Apr 22 17:43:56 2010 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Fri Apr 23 08:37:19 2010 +0100
@@ -2408,13 +2408,8 @@ class XendDomainInfo:
 
     def _releaseDevices(self, suspend = False):
         """Release all domain's devices.  Nothrow guarantee."""
-        t = xstransact("%s/device" % self.vmpath)
         if self.image:
             try:
-                for dev in t.list('tap'):
-                    log.debug("Early removing %s", dev);
-                    self.getDeviceController('tap').destroyDevice(dev, True)
-                time.sleep(0.1)
                 log.debug("Destroying device model")
                 self.image.destroyDeviceModel()
             except Exception, e:
@@ -2423,10 +2418,9 @@ class XendDomainInfo:
             log.debug("No device model")
 
         log.debug("Releasing devices")
+        t = xstransact("%s/device" % self.vmpath)
         try:
             for devclass in XendDevices.valid_devices():
-                if devclass is 'tap':
-                    continue
                 for dev in t.list(devclass):
                     try:
                         log.debug("Removing %s", dev);

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