From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0p7O-0005pJ-Bb for qemu-devel@nongnu.org; Wed, 08 Jan 2014 04:08:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0p7I-0006ny-Pj for qemu-devel@nongnu.org; Wed, 08 Jan 2014 04:08:06 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:34226 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0p7I-0006nm-GL for qemu-devel@nongnu.org; Wed, 08 Jan 2014 04:08:00 -0500 From: Peter Lieven Date: Wed, 8 Jan 2014 10:08:38 +0100 Message-Id: <1389172118-25402-7-git-send-email-pl@kamp.de> In-Reply-To: <1389172118-25402-1-git-send-email-pl@kamp.de> References: <1389172118-25402-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv4 6/6] ui/vnc: disable adaptive update calculations if not needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: sw@weilnetz.de, Peter Lieven , xiawenc@linux.vnet.ibm.com, aliguori@amazon.com Signed-off-by: Peter Lieven --- ui/vnc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index da552fe..a742d32 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3170,7 +3170,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) acl = 1; #endif } else if (strncmp(options, "lossy", 5) == 0) { +#ifdef CONFIG_VNC_JPEG vs->lossy = true; +#endif } else if (strncmp(options, "non-adaptive", 12) == 0) { vs->non_adaptive = true; } else if (strncmp(options, "share=", 6) == 0) { @@ -3187,6 +3189,13 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) } } + /* adaptive updates are only used with tight encoding and + * if lossy updates are enabled so we can disable all the + * calculations otherwise */ + if (!vs->lossy) { + vs->non_adaptive = true; + } + #ifdef CONFIG_VNC_TLS if (acl && x509 && vs->tls.x509verify) { if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) { -- 1.7.9.5