]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
vnc: ensure connection sharing/limits is always configured
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 2 Aug 2016 10:45:26 +0000 (11:45 +0100)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 28 Sep 2016 15:46:48 +0000 (10:46 -0500)
The connection sharing / limits are only set in the
vnc_display_open() method and so missed when VNC is running
with '-vnc none'. This in turn prevents clients being added
to the VNC server with the QMP "add_client" command.

This was introduced in

  commit e5f34cdd2da54f28d90889a3afd15fad2d6105ff
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   Thu Oct 2 12:09:34 2014 +0200

      vnc: track & limit connections

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1470134726-15697-4-git-send-email-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 12e29b1682e0a50ed57c324152addb585ae5ce69)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
ui/vnc.c

index 0986423870194b5059d8b6e3609808607fa9787a..71273e98c75ead7119b10f12f586c8a0b7a3778d 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3116,6 +3116,9 @@ void vnc_display_init(const char *id)
     if (!vs->kbd_layout)
         exit(1);
 
+    vs->share_policy = VNC_SHARE_POLICY_ALLOW_EXCLUSIVE;
+    vs->connections_limit = 32;
+
     qemu_mutex_init(&vs->mutex);
     vnc_start_worker_thread();