From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49098 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxyRm-0000kv-TX for qemu-devel@nongnu.org; Fri, 11 Mar 2011 04:15:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxyRk-00006k-RZ for qemu-devel@nongnu.org; Fri, 11 Mar 2011 04:15:46 -0500 Received: from [222.73.24.84] (port=60824 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxyRk-00005E-Fy for qemu-devel@nongnu.org; Fri, 11 Mar 2011 04:15:44 -0500 Message-ID: <4D79E708.9050007@cn.fujitsu.com> Date: Fri, 11 Mar 2011 17:10:32 +0800 From: Wen Congyang MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Subject: [Qemu-devel] [PATCH RESEND v3] fix vnc regression List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Stefan Weil , Corentin Chary , Anthony Liguori 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 --- ui/vnc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 34dc0cd..8fd35c1 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_WORDS * BITS_PER_LONG - width); } } } -- 1.7.1