aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan Mellor <ewan@xensource.com>2006-12-14 15:32:44 +0000
committerEwan Mellor <ewan@xensource.com>2006-12-14 15:32:44 +0000
commit5d46b4c6361eb0c043a4d0bd0f26f2a248e487b4 (patch)
tree0821447524de862abe9451b1e4e02b858d83c6be
parent4a5cb14abefcc7dd26c0fd4f3e2495ec14cc4017 (diff)
downloadxen-5d46b4c6361eb0c043a4d0bd0f26f2a248e487b4.tar.gz
xen-5d46b4c6361eb0c043a4d0bd0f26f2a248e487b4.tar.bz2
xen-5d46b4c6361eb0c043a4d0bd0f26f2a248e487b4.zip
Fix calls to destroyDevice that are missing a force flag.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
-rw-r--r--tools/python/xen/xend/server/DevController.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py
index aa96e323ce..6ac7885036 100644
--- a/tools/python/xen/xend/server/DevController.py
+++ b/tools/python/xen/xend/server/DevController.py
@@ -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))