[Xen-changelog] [xen-unstable] xend: destroy restored domain when its device doesn't exist

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1264582787 0
# Node ID 2f98b700605fd4c3ef20e94cfd176388ff0e7640
# Parent  2636e561970898517def148c19e04581b12dc860
xend: destroy restored domain when its device doesn't exist

A migrated domain keeps on running even though its disk doesn't
exist. This situation must be undesirable.

Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendCheckpoint.py |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff -r 2636e5619708 -r 2f98b700605f tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py   Tue Jan 26 15:54:40 2010 +0000
+++ b/tools/python/xen/xend/XendCheckpoint.py   Wed Jan 27 08:59:47 2010 +0000
@@ -344,19 +344,18 @@ def restore(xd, fd, dominfo = None, paus
 
         try:
             dominfo.waitForDevices() # Wait for backends to set up
-        except Exception, exn:
-            log.exception(exn)
-
-        if lock:
-            XendDomain.instance().domains_lock.acquire()
+        finally:
+            if lock:
+                XendDomain.instance().domains_lock.acquire()
 
         if not paused:
             dominfo.unpause()
 
         return dominfo
-    except:
+    except Exception, exn:
         dominfo.destroy()
-        raise
+        log.exception(exn)
+        raise exn
 
 
 class RestoreInputHandler:

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