aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-08-02 11:45:26 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-09-28 10:46:48 -0500
commitc5518b3a264f3f01bc93316a5039a53b6c436b6d (patch)
treea736ec0e42a4188458e9aa80c510494c88e18110
parent6be9ee16201f300973449ea355456e3e942f14f4 (diff)
downloadqemu-c5518b3a264f3f01bc93316a5039a53b6c436b6d.zip
qemu-c5518b3a264f3f01bc93316a5039a53b6c436b6d.tar.gz
qemu-c5518b3a264f3f01bc93316a5039a53b6c436b6d.tar.bz2
vnc: ensure connection sharing/limits is always configured
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>
-rw-r--r--ui/vnc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 0986423..71273e9 100644
--- 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();