From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52967 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Psr9O-00036f-7x for qemu-devel@nongnu.org; Fri, 25 Feb 2011 01:27:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Psr9M-0004yX-RP for qemu-devel@nongnu.org; Fri, 25 Feb 2011 01:27:38 -0500 Received: from [222.73.24.84] (port=56500 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Psr9M-0004yA-Ie for qemu-devel@nongnu.org; Fri, 25 Feb 2011 01:27:36 -0500 Message-ID: <4D674B83.9030902@cn.fujitsu.com> Date: Fri, 25 Feb 2011 14:26:11 +0800 From: Wen Congyang MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Subject: [Qemu-devel] [PATCH] fix vnc regression List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Corentin Chary , qemu-devel This patch fix the following two regressions: 1. we should use bitmap_set() and bitmap_clear() to replace vnc_set_bits(). 2. The unit of bitmap_intersects()'third parameter is bit, not words. But we pass the num of words to bitmap_intersects(). Signed-off-by: Wen Congyang --- ui/vnc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 610f884..fff34af 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1655,7 +1655,10 @@ static void framebuffer_update_request(VncState *vs, int incremental, 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, + (ds_get_width(vs->ds) / 16)); + bitmap_clear(vs->dirty[y_position + i], (ds_get_width(vs->ds) / 16), + VNC_DIRTY_WORDS * BITS_PER_LONG); } } } @@ -2406,7 +2409,8 @@ static int vnc_refresh_server_surface(VncDisplay *vd) guest_row = vd->guest.ds->data; server_row = vd->server->data; for (y = 0; y < vd->guest.ds->height; y++) { - if (bitmap_intersects(vd->guest.dirty[y], width_mask, VNC_DIRTY_WORDS)) { + if (bitmap_intersects(vd->guest.dirty[y], width_mask, + VNC_DIRTY_WORDS * BITS_PER_LONG)) { int x; uint8_t *guest_ptr; uint8_t *server_ptr; -- 1.7.1