[Xen-changelog] [xen-unstable] pygrub/xend: Fix console plumbing to xenconsole client.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1269705695 0
# Node ID f3db0ae08304d0707eda8cfc08182f444f12b35b
# Parent  0da5bad4dfcf7c2587e06b39d9228c32798195f9
pygrub/xend: Fix console plumbing to xenconsole client.

Domain's console tty now lives at serial/0/tty in xenstore.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/util/diagnose.py       |    2 +-
 tools/python/xen/xend/XendBootloader.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r 0da5bad4dfcf -r f3db0ae08304 tools/python/xen/util/diagnose.py
--- a/tools/python/xen/util/diagnose.py Sat Mar 27 16:00:30 2010 +0000
+++ b/tools/python/xen/util/diagnose.py Sat Mar 27 16:01:35 2010 +0000
@@ -77,7 +77,7 @@ def diagnose_console():
 def diagnose_console():
     port    = xstransact.Read(dompath + '/console/port')
     ringref = xstransact.Read(dompath + '/console/ring-ref')
-    tty     = xstransact.Read(dompath + '/console/tty')
+    tty     = xstransact.Read(dompath + '/serial/0/tty')
 
     if not port:
         print "Console port is missing; Xend has failed."
diff -r 0da5bad4dfcf -r f3db0ae08304 tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py   Sat Mar 27 16:00:30 2010 +0000
+++ b/tools/python/xen/xend/XendBootloader.py   Sat Mar 27 16:01:35 2010 +0000
@@ -85,7 +85,7 @@ def bootloader(blexec, disk, dom, quiet 
     fcntl.fcntl(m1, fcntl.F_SETFL, os.O_NDELAY)
 
     slavename = ptsname.ptsname(m1)
-    dom.storeDom("console/tty", slavename)
+    dom.storeDom("serial/0/tty", slavename)
 
     # Release the domain lock here, because we definitely don't want 
     # a stuck bootloader to deny service to other xend clients.

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