qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Corentin Chary <corentincj@iksaif.net>
To: qemu-devel@nongnu.org
Cc: Corentin Chary <corentincj@iksaif.net>,
	Anthony Liguori <aliguori@linux.vnet.ibm.com>,
	Alexander Graf <agraf@suse.de>, Adam Litke <agl@us.ibm.com>
Subject: [Qemu-devel] [PATCH v3 06/12] vnc: don't clear zlib stream on set_encoding
Date: Wed, 19 May 2010 09:24:06 +0200	[thread overview]
Message-ID: <1274253852-16068-7-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1274253852-16068-1-git-send-email-corentincj@iksaif.net>

On init, values are already NULL, but we shouldn't try
to reset them each time a client send a set encoding
command because this break everything. For example,
libvncclient re-send a set encoding command if the
framebuffer is resized.

This fix framebuffer resizing for zlib encoding.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 vnc-encoding-zlib.c |    5 -----
 vnc.c               |    1 -
 vnc.h               |    1 -
 3 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c
index 29dd1b7..52b18aa 100644
--- a/vnc-encoding-zlib.c
+++ b/vnc-encoding-zlib.c
@@ -140,8 +140,3 @@ void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h)
     vnc_write_u32(vs, bytes_written);
     vs->output.offset = new_offset;
 }
-
-void vnc_zlib_init(VncState *vs)
-{
-    vs->zlib_stream.opaque = NULL;
-}
diff --git a/vnc.c b/vnc.c
index e81a2a5..a5a0456 100644
--- a/vnc.c
+++ b/vnc.c
@@ -1592,7 +1592,6 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
     int i;
     unsigned int enc = 0;
 
-    vnc_zlib_init(vs);
     vs->features = 0;
     vs->vnc_encoding = 0;
     vs->tight_compression = 9;
diff --git a/vnc.h b/vnc.h
index 96f3fe7..b2d8738 100644
--- a/vnc.h
+++ b/vnc.h
@@ -397,7 +397,6 @@ void vnc_hextile_send_framebuffer_update(VncState *vs, int x,
                                          int y, int w, int h);
 void vnc_hextile_set_pixel_conversion(VncState *vs, int generic);
 
-void vnc_zlib_init(VncState *vs);
 void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
 
 #endif /* __QEMU_VNC_H */
-- 
1.7.0.2

  parent reply	other threads:[~2010-05-19  7:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-19  7:24 [Qemu-devel] [PATCH v3 00/12] *** SUBJECT HERE *** Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 01/12] Revert "vnc: set the right prefered encoding" Corentin Chary
2010-06-01 18:27   ` Anthony Liguori
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 02/12] vnc: explain why set_encodings loop is reversed Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 03/12] vnc: really call zlib if we want zlib Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 04/12] vnc: only use a single zlib stream Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 05/12] vnc: adjust compression zstream level Corentin Chary
2010-05-19  7:24 ` Corentin Chary [this message]
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 07/12] vnc: add buffer_free() Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 08/12] vnc: remove a memory leak in zlib Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 09/12] vnc: return the number of rectangles Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 10/12] vnc: add basic tight support Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 11/12] vnc: add support for tight fill encoding Corentin Chary
2010-05-19  7:24 ` [Qemu-devel] [PATCH v3 12/12] vnc: tight: add palette encoding Corentin Chary
2010-05-19  7:31 ` [Qemu-devel] [PATCH v3 00/12] *** SUBJECT HERE *** Corentin Chary
2010-05-27  6:21 ` [Qemu-devel] [PATCH 1/3] vnc: tight: don't forget last pixel in tight_encode_indexed_rect Corentin Chary
2010-05-27 14:28   ` Richard Henderson
2010-06-01 21:01     ` Corentin Chary
2010-05-27  6:21 ` [Qemu-devel] [PATCH 2/3] vnc: tight: don't forget the third color Corentin Chary
2010-05-27  6:21 ` [Qemu-devel] [PATCH 3/3] vnc: add missing target for vnc-encodings-*.o Corentin Chary

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=1274253852-16068-7-git-send-email-corentincj@iksaif.net \
    --to=corentincj@iksaif.net \
    --cc=agl@us.ibm.com \
    --cc=agraf@suse.de \
    --cc=aliguori@linux.vnet.ibm.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).