[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH RESEND v2 1/2] fix vnc regression
From: |
Corentin Chary |
Subject: |
[Qemu-devel] Re: [PATCH RESEND v2 1/2] fix vnc regression |
Date: |
Wed, 2 Mar 2011 10:56:40 +0000 |
On Wed, Mar 2, 2011 at 3:46 AM, Wen Congyang <address@hidden> 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 <address@hidden>
Acked-by: Corentin Chary <address@hidden>
> ---
> ui/vnc.c | 11 ++++++++---
> 1 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 610f884..e3761b0 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);
> }
> }
> }
> @@ -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;
> --
> 1.7.1
>
--
Corentin Chary
http://xf.iksaif.net
- [Qemu-devel] [PATCH RESEND v2 1/2] fix vnc regression, Wen Congyang, 2011/03/01
- [Qemu-devel] [PATCH RESEND 2/2] vnc: Fix heap corruption, Wen Congyang, 2011/03/01
- [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Corentin Chary, 2011/03/02
- [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Stefan Weil, 2011/03/02
- Re: [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Peter Maydell, 2011/03/02
- Re: [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Stefan Weil, 2011/03/02
- Re: [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Stefan Weil, 2011/03/02
- Re: [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Wen Congyang, 2011/03/02
- Re: [Qemu-devel] Re: [PATCH RESEND 2/2] vnc: Fix heap corruption, Peter Maydell, 2011/03/02
[Qemu-devel] Re: [PATCH RESEND v2 1/2] fix vnc regression,
Corentin Chary <=
[Qemu-devel] [PATCH 3/3] correct VNC_DIRTY_WORDS on 64 bit machine, Wen Congyang, 2011/03/02