]> git.proxmox.com Git - qemu.git/commitdiff
fix vnc regression
authorWen Congyang <wency@cn.fujitsu.com>
Fri, 11 Mar 2011 09:10:32 +0000 (17:10 +0800)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 22 Mar 2011 13:39:12 +0000 (08:39 -0500)
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 <wency@cn.fujitsu.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
ui/vnc.c

index 0b5aad2952ffbaf43b8bb1d4288a7877717226e2..2f71769a91bb33b8beeef2a300f3f7d4a85b5760 100644 (file)
--- 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);
         }
     }
 }