[Xen-changelog] Tidy exception handling on IntroduceDomain, quieten down one debug message, add

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

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 43fbea30b5c8364d328d19ca2b453bed6cbd3d94
# Parent  19a226d8db165868406ba983b0bae60b9e80f14d
Tidy exception handling on IntroduceDomain, quieten down one debug message, add
another.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>

diff -r 19a226d8db16 -r 43fbea30b5c8 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Mon Nov  7 11:28:53 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Mon Nov  7 11:30:16 2005
@@ -336,7 +336,7 @@
             return domlist[0]
     except Exception, err:
         # ignore missing domain
-        log.debug("domain_getinfo(%d) failed, ignoring: %s", dom, str(err))
+        log.trace("domain_getinfo(%d) failed, ignoring: %s", dom, str(err))
     return None
 
 
@@ -569,6 +569,8 @@
         self.storeDomDetails()
         self.refreshShutdown()
 
+        log.debug("XendDomainInfo.completeRestore done")
+
 
     def storeVmDetails(self):
         to_store = {
@@ -1066,8 +1068,11 @@
         assert self.domid is not None
         assert self.store_mfn is not None
         assert self.store_port is not None
-        
-        IntroduceDomain(self.domid, self.store_mfn, self.store_port)
+
+        try:
+            IntroduceDomain(self.domid, self.store_mfn, self.store_port)
+        except RuntimeError, exn:
+            raise XendError(str(exn))
 
 
     def initDomain(self):

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