From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47972 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzpvW-00042i-Ci for qemu-devel@nongnu.org; Wed, 16 Mar 2011 08:34:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzpvV-00044j-5I for qemu-devel@nongnu.org; Wed, 16 Mar 2011 08:34:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzpvU-00044Y-QX for qemu-devel@nongnu.org; Wed, 16 Mar 2011 08:34:09 -0400 From: Jes.Sorensen@redhat.com Date: Wed, 16 Mar 2011 13:33:33 +0100 Message-Id: <1300278816-29513-5-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300278816-29513-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300278816-29513-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] Add support for -display vnc List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org From: Jes Sorensen Signed-off-by: Jes Sorensen --- qemu-options.hx | 5 ++++- vl.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 08a99b5..5f8dc04 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=[,]\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 @end table ETEXI diff --git a/vl.c b/vl.c index 0a409f4..555bc49 100644 --- a/vl.c +++ b/vl.c @@ -1610,6 +1610,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=\n"); + exit(1); + } } else if (strstart(p, "curses", &opts)) { #ifdef CONFIG_CURSES display = DT_CURSES; -- 1.7.4