libxl+xend: use correct paths for PV console when running bootloader
PATCH 1/1 libxl+xend: use correct paths for PV console when running bootloader
# HG changeset patch
# User Ian Campbell <[email protected]>
# Date 1283428450 -3600
# Node ID 81d4e98117c6579f2e8df8369b7bba6b878cdeb9
# Parent 9b83369bc38b4bc7f4e9306e406f073d52c59c2c 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 <[email protected]>
tools/libxl/libxl_bootloader.c +1 -1
@@ -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);
tools/python/xen/util/diagnose.py +1 -1
@@ -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."
tools/python/xen/xend/XendBootloader.py +1 -1
@@ -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.