[Xen-changelog] [xen-unstable] libxl+xend: use correct paths for PV console when running bootloader

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1283881855 -3600
# Node ID 07294dbc4bb2f0bbc95909cfaf7a1a24a92eb627
# Parent  5f53805b349ecf1ec4fb588e43e8536b5d18b8f5
libxl+xend: use correct paths for PV console when running bootloader

Makes "{xl,xm} create -c GUEST" work again with pygrub in interactive
mode which was broken by 21994:2e08ec0028e4

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libxl/libxl_bootloader.c          |    2 +-
 tools/python/xen/util/diagnose.py       |    2 +-
 tools/python/xen/xend/XendBootloader.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r 5f53805b349e -r 07294dbc4bb2 tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c    Fri Sep 03 18:44:49 2010 +0100
+++ b/tools/libxl/libxl_bootloader.c    Tue Sep 07 18:50:55 2010 +0100
@@ -383,7 +383,7 @@ int libxl_run_bootloader(libxl_ctx *ctx,
         goto out_close;
     }
 
-    dom_console_xs_path = libxl_sprintf(&gc, "%s/serial/0/tty", 
libxl_xs_get_dompath(&gc, domid));
+    dom_console_xs_path = libxl_sprintf(&gc, "%s/console/tty", 
libxl_xs_get_dompath(&gc, domid));
     libxl_xs_write(&gc, XBT_NULL, dom_console_xs_path, "%s", 
dom_console_slave_tty_path);
 
     pid = fork_exec_bootloader(&bootloader_fd, (char *)info->u.pv.bootloader, 
args);
diff -r 5f53805b349e -r 07294dbc4bb2 tools/python/xen/util/diagnose.py
--- a/tools/python/xen/util/diagnose.py Fri Sep 03 18:44:49 2010 +0100
+++ b/tools/python/xen/util/diagnose.py Tue Sep 07 18:50:55 2010 +0100
@@ -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 + '/serial/0/tty')
+    tty     = xstransact.Read(dompath + '/console/tty')
 
     if not port:
         print "Console port is missing; Xend has failed."
diff -r 5f53805b349e -r 07294dbc4bb2 tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py   Fri Sep 03 18:44:49 2010 +0100
+++ b/tools/python/xen/xend/XendBootloader.py   Tue Sep 07 18:50:55 2010 +0100
@@ -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("serial/0/tty", slavename)
+    dom.storeDom("console/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