From patchwork Mon Mar 21 08:43:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 87722 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 CB72FB6F72 for ; Mon, 21 Mar 2011 19:45:45 +1100 (EST) Received: from localhost ([127.0.0.1]:57123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1ak7-0007Mt-Hv for incoming@patchwork.ozlabs.org; Mon, 21 Mar 2011 04:45:39 -0400 Received: from [140.186.70.92] (port=48881 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1aiN-0007JE-Fc for qemu-devel@nongnu.org; Mon, 21 Mar 2011 04:43:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q1aiL-0001F9-Nz for qemu-devel@nongnu.org; Mon, 21 Mar 2011 04:43:50 -0400 Received: from [222.73.24.84] (port=58316 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q1aiL-0001Dk-2Y for qemu-devel@nongnu.org; Mon, 21 Mar 2011 04:43:49 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id DF52F170118; Mon, 21 Mar 2011 16:43:41 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p2L8ba7M011628; Mon, 21 Mar 2011 16:37:36 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011032116421795-65678 ; Mon, 21 Mar 2011 16:42:17 +0800 Message-ID: <4D870F94.3010605@cn.fujitsu.com> Date: Mon, 21 Mar 2011 16:43:00 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: Corentin Chary References: <1300696478-6051-1-git-send-email-corentin.chary@gmail.com> <1300696478-6051-4-git-send-email-corentin.chary@gmail.com> In-Reply-To: <1300696478-6051-4-git-send-email-corentin.chary@gmail.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-21 16:42:17, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-21 16:42:18, Serialize complete at 2011-03-21 16:42:18 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Cc: Blue Swirl , qemu-devel , Paolo Bonzini Subject: [Qemu-devel] Re: [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 At 03/21/2011 04:34 PM, Corentin Chary Write: > 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); Sorry for my mistake. VNC_DIRTY_WORDS is removed, and we should use VNC_DIRTY_BITS instead of VNC_DIRTY_WORDS * BITS_PER_LONG. Thanks Wen Congyang. Here is the newest patch, and I forgot to resend it: From 4516c6ce980507d3a13a306a8f08baebb678cce8 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Mon, 14 Mar 2011 14:51:41 +0800 Subject: [PATCH] fix vnc regression --- ui/vnc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 1b68965..c9654d4 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1645,17 +1645,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_BITS - width); } } }