aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/xl_cmdtable.c
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-08-16 13:32:04 +0100
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-08-16 13:32:04 +0100
commitce8ffdb5516b77e2ddb7f84aa0b61dc85f8fc2df (patch)
tree681c427fe28e46dfdcf2fcd7a4795d48a803dae0 /tools/libxl/xl_cmdtable.c
parent4129c5a320bca20d94a76a99b6f133b384ada46d (diff)
downloadxen-ce8ffdb5516b77e2ddb7f84aa0b61dc85f8fc2df.tar.gz
xen-ce8ffdb5516b77e2ddb7f84aa0b61dc85f8fc2df.tar.bz2
xen-ce8ffdb5516b77e2ddb7f84aa0b61dc85f8fc2df.zip
tools: xenconsole[d] and libxl: multiple console support
This patch implements the new protocol for handling pv consoles and emulated serials as described in the document docs/misc/console.txt. The changes are: - xenconsoled: do not write the pty under serial in xenstore if xenconsoled is handling a consolepath; - xenconsole: implement support for an explicit console type parameter; the parameter can be "pv", to specify that the user wants to connect to a pv console, or "serial", to specify that the user wants to connect to an emulated serial. If the type parameter hasn't been specified be the user, xenconsole tries to guess which type of console it has to connect to, defaulting to pv console for pv guests and emulated serial for hvm guests. - xenconsole: use the new xenstore paths; - libxl: rename libxl_console_constype to libxl_console_consback: constype is used to to specify whether qemu or xenconsoled provides the backend, so I renamed it to libxl_console_consback to make it more obvious that we are talking about backends; - libxl: add a new libxl_console_constype to specify if the console is an emulated serial or a pv console; - libxl: support the new xenconsole "type" command line parameter; - libxl: use the "output" node under console in xenstore to tell qemu where do we want the output of this pv console to go; - remove the legacy "serialpath" from xenconsoled altogether Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Also: update the QEMU_TAG to pull in the qemu part of these changes. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/xl_cmdtable.c')
-rw-r--r--tools/libxl/xl_cmdtable.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c
index 90125d9cd0..73668be2f4 100644
--- a/tools/libxl/xl_cmdtable.c
+++ b/tools/libxl/xl_cmdtable.c
@@ -86,7 +86,9 @@ struct cmd_spec cmd_table[] = {
{ "console",
&main_console,
"Attach to domain's console",
- "<Domain>",
+ "[options] <Domain>\n"
+ "-t <type> console type, pv or serial\n"
+ "-n <number> console number"
},
{ "vncviewer",
&main_vncviewer,