qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Corentin Chary <corentin.chary@gmail.com>
To: anthony@codemonkey.ws
Cc: qemu-devel <qemu-devel@nongnu.org>,
	Blue Swirl <blauwirbel@gmail.com>,
	Corentin Chary <corentin.chary@gmail.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 3/4] fix vnc regression
Date: Mon, 21 Mar 2011 09:34:37 +0100	[thread overview]
Message-ID: <1300696478-6051-4-git-send-email-corentin.chary@gmail.com> (raw)
In-Reply-To: <1300696478-6051-1-git-send-email-corentin.chary@gmail.com>

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

  parent reply	other threads:[~2011-03-21  8:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-21  8:34 [Qemu-devel] [PATCH 0/4] VNC fixs collection Corentin Chary
2011-03-21  8:34 ` [Qemu-devel] [PATCH 1/4] vnc: tight: Fix crash after 2GB of output Corentin Chary
2011-04-09 22:22   ` Aurelien Jarno
2011-04-11  9:27     ` Corentin Chary
2011-04-11 10:05       ` Aurelien Jarno
2011-03-21  8:34 ` [Qemu-devel] [PATCH 2/4] vnc: don't mess up with iohandlers in the vnc thread Corentin Chary
2011-03-21  8:34 ` Corentin Chary [this message]
2011-03-21  8:43   ` [Qemu-devel] Re: [PATCH 3/4] fix vnc regression Wen Congyang
2011-03-21  8:34 ` [Qemu-devel] [PATCH 4/4] vnc: Limit r/w access to size of allocated memory Corentin Chary
2011-04-09 22:17   ` Aurelien Jarno
2011-04-10  6:28     ` Stefan Weil

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1300696478-6051-4-git-send-email-corentin.chary@gmail.com \
    --to=corentin.chary@gmail.com \
    --cc=anthony@codemonkey.ws \
    --cc=blauwirbel@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).