Patchwork Re: [PATCH 3/4] fix vnc regression

login
register
mail settings
Submitter Wen Congyang
Date March 21, 2011, 8:43 a.m.
Message ID <4D870F94.3010605@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/87722/
State New
Headers show

Comments

Wen Congyang - March 21, 2011, 8:43 a.m.
At 03/21/2011 04:34 PM, Corentin Chary Write:
> From: Wen Congyang <wency@cn.fujitsu.com>
> 
> 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: Corentin Chary <corentin.chary@gmail.com>
> ---
>  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 <wency@cn.fujitsu.com>
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(-)

Patch

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);
         }
     }
 }