debuggers.hg

changeset 21272:7f3eff15050c

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@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Apr 23 08:37:19 2010 +0100 (2010-04-23)
parents 2b97855a629f
children 3235ef7a839f
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Thu Apr 22 17:43:56 2010 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Fri Apr 23 08:37:19 2010 +0100
     1.3 @@ -2408,13 +2408,8 @@ class XendDomainInfo:
     1.4  
     1.5      def _releaseDevices(self, suspend = False):
     1.6          """Release all domain's devices.  Nothrow guarantee."""
     1.7 -        t = xstransact("%s/device" % self.vmpath)
     1.8          if self.image:
     1.9              try:
    1.10 -                for dev in t.list('tap'):
    1.11 -                    log.debug("Early removing %s", dev);
    1.12 -                    self.getDeviceController('tap').destroyDevice(dev, True)
    1.13 -                time.sleep(0.1)
    1.14                  log.debug("Destroying device model")
    1.15                  self.image.destroyDeviceModel()
    1.16              except Exception, e:
    1.17 @@ -2423,10 +2418,9 @@ class XendDomainInfo:
    1.18              log.debug("No device model")
    1.19  
    1.20          log.debug("Releasing devices")
    1.21 +        t = xstransact("%s/device" % self.vmpath)
    1.22          try:
    1.23              for devclass in XendDevices.valid_devices():
    1.24 -                if devclass is 'tap':
    1.25 -                    continue
    1.26                  for dev in t.list(devclass):
    1.27                      try:
    1.28                          log.debug("Removing %s", dev);