From patchwork Wed May 16 22:54:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Martin X-Patchwork-Id: 159802 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 0EF5CB6FBB for ; Thu, 17 May 2012 12:32:35 +1000 (EST) Received: from localhost ([::1]:51033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUqW0-0007qR-T5 for incoming@patchwork.ozlabs.org; Wed, 16 May 2012 22:32:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUn7I-0003Hv-SZ for qemu-devel@nongnu.org; Wed, 16 May 2012 18:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUn7H-0007fa-2a for qemu-devel@nongnu.org; Wed, 16 May 2012 18:54:48 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:61093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUn7G-0007f6-Rb for qemu-devel@nongnu.org; Wed, 16 May 2012 18:54:47 -0400 Received: by obbwd20 with SMTP id wd20so1951807obb.4 for ; Wed, 16 May 2012 15:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=/j1StWfn0YIIgFOveOWXyhXkyPmEKp/7XydrVXUhinw=; b=agtmMPuBwfKgose38JJvSv+D3ZIcZuNlRAxghmnJIY+hxcTCTrdQkaIt3QLzibkhpV RbPwi4Mf5d4G+OL5JYUUHWk61RWWJ/ifQ1KsZ27jdHpXPavPrVLgpSzlHnHJNFbdPjkt F/6Pr6seh9j6omvj9sXk1lN+AmD0gpKIaz0Otxm6R62SqkFAmAePEvGll916y2165o2G nKcXiTudPUu4MfEi/vzh+IgSM7KhiewAPTrHFuEdZ47oPFbcw7UD2cdqunggGJwr0tMJ ADbbBg97olnV9wjhpzlc86d5bt9fZc3rTBVluBkJ379kU1XGUcZnkLe37XkXi1NNbjjr jVhw== Received: by 10.60.25.6 with SMTP id y6mr4526995oef.42.1337208884462; Wed, 16 May 2012 15:54:44 -0700 (PDT) Received: from localhost.localdomain (108-239-117-113.lightspeed.rcsntx.sbcglobal.net. [108.239.117.113]) by mx.google.com with ESMTPS id i11sm3613334obp.17.2012.05.16.15.54.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 May 2012 15:54:43 -0700 (PDT) From: Joel Martin To: qemu-devel@nongnu.org Date: Wed, 16 May 2012 17:54:25 -0500 Message-Id: <1337208865-22306-1-git-send-email-github@martintribe.org> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 X-Mailman-Approved-At: Wed, 16 May 2012 22:32:24 -0400 Cc: Anthony Liguori , Joel Martin Subject: [Qemu-devel] [PATCH] 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 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 --- ui/vnc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index be384a5..517d5fa 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;