| Message ID | 4D6C506C.2070405@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Mar 1, 2011 at 1:48 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(). > > Changes from v1 to v2: > 1. fix the third argument of bitmap_clear() > > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Seems ok, tested with valgrind this time. But could you re-send this one and the other one at http://patchwork.ozlabs.org/patch/84887/ : - with appropriate Signed-off-by: and changelog for the other patch - using a const size_t width = ds_get_width(vs->ds) / 16; in both patchs to make the call more explicit Thanks,
diff --git a/ui/vnc.c b/ui/vnc.c index 610f884..655aae6 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1655,7 +1655,11 @@ 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 - + (ds_get_width(vs->ds) / 16)); } } } @@ -2406,7 +2410,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(). Changes from v1 to v2: 1. fix the third argument of bitmap_clear() Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> --- ui/vnc.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)