|
|
|
|
|
|
|
|
|
|
xen-changelog
[Xen-changelog] [xen-unstable] xend: Replace tabs with 8 whitespaces in
# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1181898092 -3600
# Node ID 9a915873be8c5672bf56fd71117a9eb9e7c69fe6
# Parent b4c16658ca30b05964888aff65dec0561ade2714
xend: Replace tabs with 8 whitespaces in DevController.py
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
tools/python/xen/xend/server/DevController.py | 32 +++++++++++++-------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff -r b4c16658ca30 -r 9a915873be8c
tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py Fri Jun 15 09:42:39
2007 +0100
+++ b/tools/python/xen/xend/server/DevController.py Fri Jun 15 10:01:32
2007 +0100
@@ -213,7 +213,7 @@ class DevController:
devid = int(devid)
frontpath = self.frontendPath(devid)
- if frontpath:
+ if frontpath:
backpath = xstransact.Read(frontpath, "backend")
# Modify online status /before/ updating state (latter is watched by
@@ -224,22 +224,22 @@ class DevController:
if force:
if backpath:
xstransact.Remove(backpath)
- if frontpath:
+ if frontpath:
xstransact.Remove(frontpath)
- return
-
- # Wait till both frontpath and backpath are removed from
- # xenstore, or timed out
- if frontpath:
- status = self.waitUntilDestroyed(frontpath)
- if status == Timeout:
- # Exception will be caught by destroyDevice in XendDomainInfo.py
- raise EnvironmentError
- if backpath:
- status = self.waitUntilDestroyed(backpath)
- if status == Timeout:
- # Exception will be caught by destroyDevice in XendDomainInfo.py
- raise EnvironmentError
+ return
+
+ # Wait till both frontpath and backpath are removed from
+ # xenstore, or timed out
+ if frontpath:
+ status = self.waitUntilDestroyed(frontpath)
+ if status == Timeout:
+ # Exception will be caught by destroyDevice in
XendDomainInfo.py
+ raise EnvironmentError
+ if backpath:
+ status = self.waitUntilDestroyed(backpath)
+ if status == Timeout:
+ # Exception will be caught by destroyDevice in
XendDomainInfo.py
+ raise EnvironmentError
self.vm._removeVm("device/%s/%d" % (self.deviceClass, devid))
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
<Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-changelog] [xen-unstable] xend: Replace tabs with 8 whitespaces in DevController.py,
Xen patchbot-unstable <=
|
|
|
|
|