[Xen-changelog] [xen-unstable] Fix calls to destroyDevice that are missing a force flag.

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 85c1e2383e98cdddfa50b80a3a73dfbe05af9d71
# Parent  d0f682ada0b2c159b3cda78fdbf9e8c38082fcc8
Fix calls to destroyDevice that are missing a force flag.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/server/DevController.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r d0f682ada0b2 -r 85c1e2383e98 
tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py     Thu Dec 14 15:10:47 
2006 +0000
+++ b/tools/python/xen/xend/server/DevController.py     Thu Dec 14 15:32:44 
2006 +0000
@@ -155,13 +155,13 @@ class DevController:
         status = self.waitForBackend(devid)
 
         if status == Timeout:
-            self.destroyDevice(devid)
+            self.destroyDevice(devid, False)
             raise VmError("Device %s (%s) could not be connected. "
                           "Hotplug scripts not working." %
                           (devid, self.deviceClass))
 
         elif status == Error:
-            self.destroyDevice(devid)
+            self.destroyDevice(devid, False)
             raise VmError("Device %s (%s) could not be connected. "
                           "Backend device not found." %
                           (devid, self.deviceClass))
@@ -180,7 +180,7 @@ class DevController:
             if not err:
                 err = "Busy."
                 
-            self.destroyDevice(devid)
+            self.destroyDevice(devid, False)
             raise VmError("Device %s (%s) could not be connected.\n%s" %
                           (devid, self.deviceClass, err))
 

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