From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vzs1C-0004qP-Eb for qemu-devel@nongnu.org; Sun, 05 Jan 2014 13:01:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vzs16-0004pl-Ol for qemu-devel@nongnu.org; Sun, 05 Jan 2014 13:01:46 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:38577 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vzs16-0004oB-B8 for qemu-devel@nongnu.org; Sun, 05 Jan 2014 13:01:40 -0500 From: Peter Lieven Date: Sun, 5 Jan 2014 19:02:31 +0100 Message-Id: <1388944951-14767-7-git-send-email-pl@kamp.de> In-Reply-To: <1388944951-14767-1-git-send-email-pl@kamp.de> References: <1388944951-14767-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv3 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 , 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 805c47a..cdb1f4f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3171,7 +3171,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) { @@ -3188,6 +3190,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