| Message ID | 4D674B83.9030902@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 25, 2011 at 7:26 AM, Wen Congyang <wency@cn.fujitsu.com> wrote: > 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 <wency@cn.fujitsu.com> > > --- > 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); > } > } > } Oh, right, (!incremental) case was broken. > @@ -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; Good catch, Thanks, Acked-by: Corentin Chary <corentin.chary@gmail.com>
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;
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 <wency@cn.fujitsu.com> --- ui/vnc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)