ia64/xen-unstable

changeset 7358:09447f91ab49

Don't try and call DevController if we can't destroy a device ourselves,
because we are already inside the ValueError exception handler, so we know that
the give device identifier is not an integer, and DevController.destroyDevice
only accepts integers. Fixes bug #315.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@ewan
date Wed Oct 12 12:56:52 2005 +0100 (2005-10-12)
parents 3dd931842e71
children 00a324b3a2db
files tools/python/xen/xend/server/blkif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/blkif.py	Wed Oct 12 12:54:43 2005 +0100
     1.2 +++ b/tools/python/xen/xend/server/blkif.py	Wed Oct 12 12:56:52 2005 +0100
     1.3 @@ -96,6 +96,4 @@ class BlkifController(DevController):
     1.4                  if self.readBackend(i, 'dev') == devid:
     1.5                      DevController.destroyDevice(self, i)
     1.6                      return
     1.7 -            # Try this, but it's almost certainly going to throw VmError,
     1.8 -            # since we can't find the device.
     1.9 -            DevController.destroyDevice(self, int(devid))
    1.10 +            raise VmError("Device %s not connected" % devid)