kvm tools: Introduce --enable-virtio-console option

This option enables virtio console and disables serial console.
At this time, the virtio and serial console can not work simultaneously.
Becasue we can not put both console's output to user at the same time.
However, once we redirect the virtio console to a pipe or socket. We can
use both console simultaneously.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2015-06-01 16:39:41 +01:00
committed by Will Deacon
parent 9bd8ac5c92
commit c067c5c17f
+5 -1
View File
@@ -17,11 +17,12 @@
#include <stdio.h>
extern bool ioport_debug;
extern int active_console;
static void usage(char *argv[])
{
fprintf(stderr, " usage: %s "
"[--single-step] [--ioport-debug] "
"[--single-step] [--ioport-debug] [--enable-virtio-console] "
"[--kvm-dev=<device>] [--mem=<size-in-MiB>] [--params=<kernel-params>] "
"[--initrd=<initrd>] [--kernel=]<kernel-image> [--image=]<disk-image>\n",
argv[0]);
@@ -85,6 +86,9 @@ int main(int argc, char *argv[])
} else if (option_matches(argv[i], "--single-step")) {
single_step = true;
continue;
} else if (option_matches(argv[i], "--enable-virtio-console")) {
active_console = CONSOLE_VIRTIO;
continue;
} else if (option_matches(argv[i], "--mem=")) {
unsigned long val = atol(&argv[i][6]) << 20;
if (val < ram_size)