From patchwork Mon Mar 21 08:34:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 87721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 40EFCB6F2B for ; Mon, 21 Mar 2011 19:41:20 +1100 (EST) Received: from localhost ([127.0.0.1]:54985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1afs-0005Ui-Dc for incoming@patchwork.ozlabs.org; Mon, 21 Mar 2011 04:41:16 -0400 Received: from [140.186.70.92] (port=52990 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1aZg-0002Wp-By for qemu-devel@nongnu.org; Mon, 21 Mar 2011 04:34:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q1aZd-0007Qi-I1 for qemu-devel@nongnu.org; Mon, 21 Mar 2011 04:34:51 -0400 Received: from smtp5.tech.numericable.fr ([82.216.111.41]:46746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q1aZd-0007QN-C2 for qemu-devel@nongnu.org; Mon, 21 Mar 2011 04:34:49 -0400 Received: from localhost.localdomain (ip-138.net-82-216-39.nice.rev.numericable.fr [82.216.39.138]) by smtp5.tech.numericable.fr (Postfix) with ESMTP id 88043124020; Mon, 21 Mar 2011 09:34:48 +0100 (CET) From: Corentin Chary To: anthony@codemonkey.ws Date: Mon, 21 Mar 2011 09:34:37 +0100 Message-Id: <1300696478-6051-4-git-send-email-corentin.chary@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1300696478-6051-1-git-send-email-corentin.chary@gmail.com> References: <1300696478-6051-1-git-send-email-corentin.chary@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 82.216.111.41 Cc: qemu-devel , Blue Swirl , Corentin Chary , Paolo Bonzini Subject: [Qemu-devel] [PATCH 3/4] fix vnc regression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wen Congyang This patch fix the following regression: 1. we should use bitmap_set() and bitmap_clear() to replace vnc_set_bits(). Signed-off-by: Wen Congyang Signed-off-by: Corentin Chary --- ui/vnc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 5d4beaa..90b6384 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1656,17 +1656,21 @@ static void framebuffer_update_request(VncState *vs, int incremental, int x_position, int y_position, int w, int h) { + int i; + const size_t width = ds_get_width(vs->ds) / 16; + if (y_position > ds_get_height(vs->ds)) y_position = ds_get_height(vs->ds); if (y_position + h >= ds_get_height(vs->ds)) h = ds_get_height(vs->ds) - y_position; - int i; vs->need_update = 1; if (!incremental) { vs->force_update = 1; for (i = 0; i < h; i++) { - bitmap_set(vs->dirty[y_position + i], x_position / 16, w / 16); + bitmap_set(vs->dirty[y_position + i], 0, width); + bitmap_clear(vs->dirty[y_position + i], width, + VNC_DIRTY_WORDS * BITS_PER_LONG - width); } } }