From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP8Ls-0007p9-Hi for qemu-devel@nongnu.org; Fri, 19 Oct 2012 04:54:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TP8Lm-0008Ek-83 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 04:54:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP8Ll-0008EC-V7 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 04:54:38 -0400 From: Stefan Hajnoczi Date: Fri, 19 Oct 2012 10:54:19 +0200 Message-Id: <1350636864-22263-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1350636864-22263-1-git-send-email-stefanha@redhat.com> References: <1350636864-22263-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] ui/vnc: Only report/use TIGHT_PNG encoding if enabled. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Joel Martin , qemu-devel@nongnu.org, Stefan Hajnoczi 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 --- ui/vnc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 33e6386..66ae930 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1806,10 +1806,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; -- 1.7.11.7