From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue, 28 Mar 2017 16:06:46 +0000 (+0200)
Subject: vnc: allow to connect with add_client when -vnc none
X-Git-Tag: v2.9.0-rc3~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa03cb7fd212bc07f0253db9ea436383ddc6c08f;p=thirdparty%2Fqemu.git

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>
---

diff --git a/ui/vnc.c b/ui/vnc.c
index 821acdd8b02..243e99bb950 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;