[Xen-changelog] [xen-3.1-testing] [XEND] Move Vifctl.network('start') earlier in Xend startup so XendNode can find networks when its initialised.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tom Wilkie <tom.wilkie@xxxxxxxxx>
# Date 1178122492 -3600
# Node ID dea0ba4e0de164f6fe80f227d3b170ef4c7051e0
# Parent  32b575a311efa2f63ce65ca2dafbdccbeb4300c8
[XEND] Move Vifctl.network('start') earlier in Xend startup so XendNode can 
find networks when its initialised.

signed-off-by: Tom Wilkie <tom.wilkie@xxxxxxxxx>
---
 tools/python/xen/xend/server/SrvDaemon.py |    2 +-
 tools/python/xen/xend/server/SrvServer.py |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff -r 32b575a311ef -r dea0ba4e0de1 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Wed May 02 16:43:45 2007 +0100
+++ b/tools/python/xen/xend/server/SrvDaemon.py Wed May 02 17:14:52 2007 +0100
@@ -342,7 +342,7 @@ class Daemon:
                 log.info("Xend version: Unknown.")
 
             relocate.listenRelocation()
-            servers = SrvServer.create()
+            servers = SrvServer.create(status)
             servers.start(status)
             del servers
             
diff -r 32b575a311ef -r dea0ba4e0de1 tools/python/xen/xend/server/SrvServer.py
--- a/tools/python/xen/xend/server/SrvServer.py Wed May 02 16:43:45 2007 +0100
+++ b/tools/python/xen/xend/server/SrvServer.py Wed May 02 17:14:52 2007 +0100
@@ -95,14 +95,6 @@ class XendServers:
         self.cleanup(signum, frame, reloading = True)
 
     def start(self, status):
-        # Running the network script will spawn another process, which takes
-        # the status fd with it unless we set FD_CLOEXEC.  Failing to do this
-        # causes the read in SrvDaemon to hang even when we have written here.
-        if status:
-            fcntl.fcntl(status, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-        
-        Vifctl.network('start')
-
         # Prepare to catch SIGTERM (received when 'xend stop' is executed)
         # and call each server's cleanup if possible
         signal.signal(signal.SIGTERM, self.cleanup)
@@ -249,7 +241,15 @@ def _loadConfig(servers, root, reload):
         servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False))
 
 
-def create():
+def create(status):
+    # Running the network script will spawn another process, which takes
+    # the status fd with it unless we set FD_CLOEXEC.  Failing to do this
+    # causes the read in SrvDaemon to hang even when we have written here.
+    if status:
+        fcntl.fcntl(status, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
+    
+    Vifctl.network('start')
+
     root = SrvDir()
     root.putChild('xend', SrvRoot())
     servers = XendServers(root)

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