From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMzeD-0001GQ-1K for qemu-devel@nongnu.org; Mon, 10 Mar 2014 08:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMze7-0000ex-1F for qemu-devel@nongnu.org; Mon, 10 Mar 2014 08:49:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMze6-0000es-PG for qemu-devel@nongnu.org; Mon, 10 Mar 2014 08:49:30 -0400 From: Gerd Hoffmann Date: Mon, 10 Mar 2014 13:49:13 +0100 Message-Id: <1394455753-13783-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1394455753-13783-1-git-send-email-kraxel@redhat.com> References: <1394455753-13783-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 9/9] 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: Peter Lieven , Gerd Hoffmann , Anthony Liguori From: Peter Lieven Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 25e4380..9c84b3e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3150,7 +3150,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) { @@ -3167,6 +3169,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.8.3.1