[Xen-changelog] [xen-unstable] stubdom: fix mini-os messages log and SDL termination

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204204228 0
# Node ID 6b875abd0a9ecccb5c26ed6eeef676ef29281ca6
# Parent  ecf7ded43d5c636c22a575216fbedcb9b527be4f
stubdom: fix mini-os messages log and SDL termination

We can now let the stubdom-dm script output mini-os messages to
stdout/err so that it gets output to the new
/var/log/xen/qemu-dm-$domname.log

In the SDL case, we must not wait for the VNC server port to appear,
as it won't ever.

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
---
 stubdom/stubdom-dm |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff -r ecf7ded43d5c -r 6b875abd0a9e stubdom/stubdom-dm
--- a/stubdom/stubdom-dm        Thu Feb 28 13:09:28 2008 +0000
+++ b/stubdom/stubdom-dm        Thu Feb 28 13:10:28 2008 +0000
@@ -62,32 +62,23 @@ done
 
 creation="xm create -c stubdom-$domname target=$domid memory=32"
 
-(while true ; do sleep 60 ; done) | $creation > 
/var/log/xen/qemu-dm-$domid.log &
+(while true ; do sleep 60 ; done) | $creation &
 #xterm -geometry +0+0 -e /bin/sh -c "$creation ; echo ; echo press ENTER to 
shut down ; read" &
 consolepid=$!
 
-
-# Wait for vnc server to appear
-while ! vnc_port=`xenstore-read /local/domain/$domid/console/vnc-port`
-do
-        # Check that the stubdom job is still alive
-        kill -0 $consolepid || term
-       sleep 1
-done
-
-################
-# DEBUG: tcpdump
-#while ! stubdomid=`xm domid stubdom-$domname`
-#do
-#        sleep 1
-#done
-#xterm -geometry 160x25+0+$height -e /bin/sh -c "tcpdump -n -i 
vif$stubdomid.0" &
-#xterm -geometry 160x25+0+$((2 * $height)) -e /bin/sh -c "tcpdump -n -i 
vif$stubdomid.1" &
 
 ###########
 # vncviewer
 if [ "$vncviewer" = 1 ]
 then
+    # Wait for vnc server to appear
+    while ! vnc_port=`xenstore-read /local/domain/$domid/console/vnc-port`
+    do
+        # Check that the stubdom job is still alive
+        kill -0 $consolepid || term
+       sleep 1
+    done
+
     vncviewer $ip:$vnc_port &
     vncpid=$!
 fi

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