From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Weil <sw@weilnetz.de>, Gerd Hoffmann <kraxel@redhat.com>,
Jason Andryuk <jandryuk@gmail.com>
Subject: [PULL 6/9] vnc-stubs: Allow -vnc none
Date: Wed, 14 Oct 2020 10:21:46 +0200 [thread overview]
Message-ID: <20201014082149.26853-7-kraxel@redhat.com> (raw)
In-Reply-To: <20201014082149.26853-1-kraxel@redhat.com>
From: Jason Andryuk <jandryuk@gmail.com>
Currently `-vnc none` is fatal when built with `--disable-vnc`. Make
vnc_parse accept "none", so QEMU still run without using vnc.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Message-id: 20201009014032.3507-1-jandryuk@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc-stubs.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ui/vnc-stubs.c b/ui/vnc-stubs.c
index 06c4ac6296eb..c6b737dcec67 100644
--- a/ui/vnc-stubs.c
+++ b/ui/vnc-stubs.c
@@ -12,6 +12,9 @@ int vnc_display_pw_expire(const char *id, time_t expires)
};
QemuOpts *vnc_parse(const char *str, Error **errp)
{
+ if (strcmp(str, "none") == 0) {
+ return NULL;
+ }
error_setg(errp, "VNC support is disabled");
return NULL;
}
--
2.27.0
next prev parent reply other threads:[~2020-10-14 8:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 8:21 [PULL 0/9] Ui 20201014 patches Gerd Hoffmann
2020-10-14 8:21 ` [PULL 1/9] qemu-edid: drop cast Gerd Hoffmann
2020-10-14 8:21 ` [PULL 2/9] curses: Fixes compiler error that complain don't have langinfo.h on msys2/mingw Gerd Hoffmann
2020-10-14 8:21 ` [PULL 3/9] curses: Fixes curses compiling errors Gerd Hoffmann
2020-10-14 8:21 ` [PULL 4/9] win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw Gerd Hoffmann
2020-10-14 8:21 ` [PULL 5/9] configure: Fixes ncursesw detection under msys2/mingw by convert them to meson Gerd Hoffmann
2020-10-14 18:22 ` Bruce Rogers
2020-10-14 19:16 ` 罗勇刚(Yonggang Luo)
2020-10-14 19:17 ` 罗勇刚(Yonggang Luo)
2020-10-14 20:10 ` Bruce Rogers
2020-10-14 8:21 ` Gerd Hoffmann [this message]
2020-10-14 8:21 ` [PULL 7/9] SDL: enable OpenGL context creation Gerd Hoffmann
2020-10-14 8:21 ` [PULL 8/9] input-linux: Reset il->fd handler before closing it Gerd Hoffmann
2020-10-14 8:21 ` [PULL 9/9] ui: Fix default window_id value Gerd Hoffmann
2020-10-14 14:24 ` [PULL 0/9] Ui 20201014 patches Peter Maydell
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=20201014082149.26853-7-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=jandryuk@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/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).