[Xen-changelog] [xen-unstable] [SOLARIS] Xen daemons are managed separately, so we need a way to start

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

# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID 0a1a5b2072a304d8dc14fc17f535c63ac86c309e
# Parent  2732e3f94e2ed45d4a91c3114271b83c62764bcc
[SOLARIS] Xen daemons are managed separately, so we need a way to start
just xend, and we need to disable xend's self-restarter.

Merged with Xen API Tree.

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/python/xen/xend/server/SrvDaemon.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

diff -r 2732e3f94e2e -r 0a1a5b2072a3 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Thu Oct 19 11:35:09 2006 +0100
+++ b/tools/python/xen/xend/server/SrvDaemon.py Thu Oct 19 11:36:49 2006 +0100
@@ -17,6 +17,7 @@ import xen.lowlevel.xc
 import xen.lowlevel.xc
 
 from xen.xend.XendLogging import log
+from xen.xend import osdep
 
 import relocate
 import SrvServer
@@ -168,8 +169,14 @@ class Daemon:
             # ready to receive requests.  All subsequent restarts we don't
             # want this behaviour, or the pipe will eventually fill up, so
             # we just pass None into run in subsequent cases (by clearing w
-            # in the parent of the first fork).
+            # in the parent of the first fork).  On some operating systems,
+            # restart is managed externally, so we won't fork, and just exit.
             while True:
+
+                if not osdep.xend_autorestart:
+                    self.run(os.fdopen(w, 'w'))
+                    break
+
                 pid = self.fork_pid()
                 if pid:
                     if w is not None:

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