Commit-ID: 9d7a7f52ca350f1d6807aadd2b6ed514559bd411 Gitweb: http://git.kernel.org/tip/9d7a7f52ca350f1d6807aadd2b6ed514559bd411 Author: Matt Evans <matt@xxxxxxxxxx> AuthorDate: Fri, 9 Dec 2011 17:54:20 +1100 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Fri, 9 Dec 2011 13:49:59 +0200 kvm tools: Add CONSOLE_HV term type and allow it to be selected This patch paves the way for adding a hypervisor console, useful on systems that support one out of the box yet don't have either serial port or virtio console support (e.g. kernels expecting POWER SPAPR). Signed-off-by: Matt Evans <matt@xxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/builtin-run.c | 8 ++++++-- tools/kvm/include/kvm/term.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 68a3246..c067685 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -416,7 +416,7 @@ static const struct option options[] = { OPT_BOOLEAN('\0', "rng", &virtio_rng, "Enable virtio Random Number Generator"), OPT_CALLBACK('\0', "9p", NULL, "dir_to_share,tag_name", "Enable virtio 9p to share files between host and guest", virtio_9p_rootdir_parser), - OPT_STRING('\0', "console", &console, "serial or virtio", + OPT_STRING('\0', "console", &console, "serial, virtio or hv", "Console to use"), OPT_STRING('\0', "dev", &dev, "device_file", "KVM device file"), OPT_CALLBACK('\0', "tty", NULL, "tty id", @@ -776,8 +776,12 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) if (!strncmp(console, "virtio", 6)) active_console = CONSOLE_VIRTIO; - else + else if (!strncmp(console, "serial", 6)) active_console = CONSOLE_8250; + else if (!strncmp(console, "hv", 2)) + active_console = CONSOLE_HV; + else + pr_warning("No console!"); if (!host_ip) host_ip = DEFAULT_HOST_ADDR; diff --git a/tools/kvm/include/kvm/term.h b/tools/kvm/include/kvm/term.h index 938c26f..a6a9822 100644 --- a/tools/kvm/include/kvm/term.h +++ b/tools/kvm/include/kvm/term.h @@ -6,6 +6,7 @@ #define CONSOLE_8250 1 #define CONSOLE_VIRTIO 2 +#define CONSOLE_HV 3 int term_putc_iov(int who, struct iovec *iov, int iovcnt, int term); int term_getc_iov(int who, struct iovec *iov, int iovcnt, int term); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html