qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jes.Sorensen@redhat.com
To: qemu-devel@nongnu.org
Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH 4/7] Add support for -display vnc
Date: Wed, 16 Mar 2011 13:33:33 +0100	[thread overview]
Message-ID: <1300278816-29513-5-git-send-email-Jes.Sorensen@redhat.com> (raw)
In-Reply-To: <1300278816-29513-1-git-send-email-Jes.Sorensen@redhat.com>

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 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=<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 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=<display>\n");
+            exit(1);
+        }
     } else if (strstart(p, "curses", &opts)) {
 #ifdef CONFIG_CURSES
         display = DT_CURSES;
-- 
1.7.4

  parent reply	other threads:[~2011-03-16 12:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-16 12:33 [Qemu-devel] [PATCH v5 0/7] Introduce -display and make VNC optional Jes.Sorensen
2011-03-16 12:33 ` [Qemu-devel] [PATCH 1/7] Consolidate DisplaySurface allocation in qemu_alloc_display() Jes.Sorensen
2011-03-16 12:33 ` [Qemu-devel] [PATCH 2/7] Introduce -display argument Jes.Sorensen
2011-03-16 12:33 ` [Qemu-devel] [PATCH 3/7] Introduce -display none Jes.Sorensen
2011-03-16 12:33 ` Jes.Sorensen [this message]
2011-03-16 12:33 ` [Qemu-devel] [PATCH 5/7] error message if user specifies SDL cmd line option when SDL is disabled Jes.Sorensen
2011-03-16 12:33 ` [Qemu-devel] [PATCH 6/7] error message if user specifies curses on cmd line when curses " Jes.Sorensen
2011-03-16 12:33 ` [Qemu-devel] [PATCH 7/7] Make VNC support optional Jes.Sorensen
2011-06-02 18:59   ` [Qemu-devel] [PATCH] cocoa: Revert dependency on VNC Andreas Färber
2011-06-09 18:31     ` Andreas Färber
2011-03-22 16:28 ` [Qemu-devel] [PATCH v5 0/7] Introduce -display and make VNC optional Anthony Liguori
  -- strict thread matches above, loose matches on Subject: below --
2011-03-16 11:00 [Qemu-devel] [PATCH v4 " Jes.Sorensen
2011-03-16 11:00 ` [Qemu-devel] [PATCH 4/7] Add support for -display vnc Jes.Sorensen
2011-03-15 15:45 [Qemu-devel] [PATCH v3 0/7] Introduce -display and make VNC optional Jes.Sorensen
2011-03-15 15:45 ` [Qemu-devel] [PATCH 4/7] Add support for -display vnc Jes.Sorensen
2011-03-15 12:36 [Qemu-devel] [PATCH v2 0/7] Introduce -display and make VNC optional Jes.Sorensen
2011-03-15 12:36 ` [Qemu-devel] [PATCH 4/7] Add support for -display vnc Jes.Sorensen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1300278816-29513-5-git-send-email-Jes.Sorensen@redhat.com \
    --to=jes.sorensen@redhat.com \
    --cc=jan.kiszka@siemens.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).