aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2017-03-28 18:06:46 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-04-03 11:48:55 +0200
commitfa03cb7fd212bc07f0253db9ea436383ddc6c08f (patch)
treef80922f13a2a079b69c7dda48d78e4f4910ce4a4
parent1684907c924140be00950a8a17740377f477a6a6 (diff)
downloadqemu-fa03cb7fd212bc07f0253db9ea436383ddc6c08f.zip
qemu-fa03cb7fd212bc07f0253db9ea436383ddc6c08f.tar.gz
qemu-fa03cb7fd212bc07f0253db9ea436383ddc6c08f.tar.bz2
vnc: allow to connect with add_client when -vnc none
Do not skip VNC initialization, in particular of auth method when vnc is configured without sockets, since we should still allow connections through QMP add_client. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1434551 Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20170328160646.21250-1-marcandre.lureau@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/vnc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 821acdd..243e99b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3786,10 +3786,6 @@ void vnc_display_open(const char *id, Error **errp)
goto fail;
}
- if (saddr == NULL) {
- return;
- }
-
password = qemu_opt_get_bool(opts, "password", false);
if (password) {
if (fips_get_state()) {
@@ -3974,6 +3970,10 @@ void vnc_display_open(const char *id, Error **errp)
register_displaychangelistener(&vd->dcl);
}
+ if (saddr == NULL) {
+ goto cleanup;
+ }
+
if (reverse) {
if (vnc_display_connect(vd, saddr, nsaddr, wsaddr, nwsaddr, errp) < 0) {
goto fail;