summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2011-03-16 13:33:33 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-03-22 08:39:11 -0500
commit3264ff120c032df83ae3f6aa84fbe90ff55a3a13 (patch)
treeba9ae6d9af721a0c9a452c9afd22e285f05d05bf
parent4171d32e6eea47bf2cd160ace0ec3639e10b3aa9 (diff)
downloadqemu-3264ff120c032df83ae3f6aa84fbe90ff55a3a13.tar.gz
Add support for -display vnc
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-options.hx5
-rw-r--r--vl.c14
2 files changed, 18 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 08a99b5ef5..5f8dc0498f 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -592,7 +592,8 @@ ETEXI
DEF("display", HAS_ARG, QEMU_OPTION_display,
"-display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off]\n"
- " [,window_close=on|off]|curses|none\n"
+ " [,window_close=on|off]|curses|none|\n"
+ " vnc=<display>[,<optargs>]\n"
" select display type\n", QEMU_ARCH_ALL)
STEXI
@item -display @var{type}
@@ -615,6 +616,8 @@ graphics card, but its output will not be displayed to the QEMU
user. This option differs from the -nographic option in that it
only affects what is done with video output; -nographic also changes
the destination of the serial and parallel port data.
+@item vnc
+Start a VNC server on display <arg>
@end table
ETEXI
diff --git a/vl.c b/vl.c
index 2da2136546..1cb7ce2801 100644
--- a/vl.c
+++ b/vl.c
@@ -1611,6 +1611,20 @@ static DisplayType select_display(const char *p)
fprintf(stderr, "SDL support is disabled\n");
exit(1);
#endif
+ } else if (strstart(p, "vnc", &opts)) {
+ display_remote++;
+
+ if (*opts) {
+ const char *nextopt;
+
+ if (strstart(opts, "=", &nextopt)) {
+ vnc_display = nextopt;
+ }
+ }
+ if (!vnc_display) {
+ fprintf(stderr, "VNC requires a display argument vnc=<display>\n");
+ exit(1);
+ }
} else if (strstart(p, "curses", &opts)) {
#ifdef CONFIG_CURSES
display = DT_CURSES;