From patchwork Mon Feb 4 10:40:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 217894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B20A72C02A7 for ; Mon, 4 Feb 2013 23:33:55 +1100 (EST) Received: from localhost ([::1]:47334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2Jbp-0005Bw-Gc for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2013 05:49:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JbT-0004gf-Rm for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:48:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2JbQ-0002vS-MQ for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:48:47 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:41735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JbQ-0002uv-Fj; Mon, 04 Feb 2013 05:48:44 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 7BD95A03E6; Mon, 4 Feb 2013 14:48:43 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 72F1952A; Mon, 4 Feb 2013 14:41:27 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2013 14:40:30 +0400 Message-Id: <1359974470-17044-21-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Michael Tokarev , Joel Martin , qemu-stable@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 20/60] ui/vnc: Only report/use TIGHT_PNG encoding if enabled. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Joel Martin If TIGHT_PNG is not enabled by the --enable-vnc-png configure flag then do not report to the client that it is supported. Also, since TIGHT_PNG is the same as the TIGHT encoding but with the filter/copy replaced with PNG data, adding it to the supported encodings list when it is disabled will cause the TIGHT encoding to be used even though the client requested TIGHT_PNG. Signed-off-by: Joel Martin Signed-off-by: Stefan Hajnoczi (cherry picked from commit fe3e7f2dc05225cdd2ba40defcd4e2581bebc5e0) Signed-off-by: Michael Tokarev --- ui/vnc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 54bc5ad..8cec55f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1818,10 +1818,12 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vs->features |= VNC_FEATURE_TIGHT_MASK; vs->vnc_encoding = enc; break; +#ifdef CONFIG_VNC_PNG case VNC_ENCODING_TIGHT_PNG: vs->features |= VNC_FEATURE_TIGHT_PNG_MASK; vs->vnc_encoding = enc; break; +#endif case VNC_ENCODING_ZLIB: vs->features |= VNC_FEATURE_ZLIB_MASK; vs->vnc_encoding = enc;