[Xen-changelog] Don't try and call DevController if we can't destroy a device ourselves,

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

# HG changeset patch
# User emellor@ewan
# Node ID 09447f91ab4918d40b6a2357b1b8665ffa4726e6
# Parent  3dd931842e71afbd85e3834189b32a42c022bfc3
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@xxxxxxxxxxxxx>

diff -r 3dd931842e71 -r 09447f91ab49 tools/python/xen/xend/server/blkif.py
--- a/tools/python/xen/xend/server/blkif.py     Wed Oct 12 11:54:43 2005
+++ b/tools/python/xen/xend/server/blkif.py     Wed Oct 12 11:56:52 2005
@@ -96,6 +96,4 @@
                 if self.readBackend(i, 'dev') == devid:
                     DevController.destroyDevice(self, i)
                     return
-            # Try this, but it's almost certainly going to throw VmError,
-            # since we can't find the device.
-            DevController.destroyDevice(self, int(devid))
+            raise VmError("Device %s not connected" % devid)

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