[Xen-changelog] IntroduceDomain of dom0 can fail when it's already connected.

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID d38da169752eb08e42fd13f1a465d36a09b50f3a
# Parent  574aeba9859daaf038ec97d15dc1e18a84611d8e
IntroduceDomain of dom0 can fail when it's already connected.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 574aeba9859d -r d38da169752e tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 13 16:55:21 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 13 16:56:02 2005
@@ -27,6 +27,7 @@
 import os
 import time
 import threading
+import errno
 
 import xen.lowlevel.xc; xc = xen.lowlevel.xc.new()
 from xen.util.ip import check_subnet, get_current_ipgw
@@ -1097,7 +1098,14 @@
         ref = xc.init_store(self.store_channel.port2)
         if ref and ref >= 0:
             self.setStoreRef(ref)
-            IntroduceDomain(self.id, ref, self.store_channel.port1, self.path)
+            try:
+                IntroduceDomain(self.id, ref, self.store_channel.port1,
+                                self.path)
+            except RuntimeError, ex:
+                if ex.args[0] == errno.EISCONN:
+                    pass
+                else:
+                    raise
             # get run-time value of vcpus and update store
             self.exportVCPUSToDB(dom_get(self.id)['vcpus'])
 

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