From patchwork Thu May 6 08:39:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 51796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 547A2B7D4A for ; Thu, 6 May 2010 18:39:23 +1000 (EST) Received: from localhost ([127.0.0.1]:57554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9wc4-00046B-Hy for incoming@patchwork.ozlabs.org; Thu, 06 May 2010 04:39:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9wYe-0001AW-Q4 for qemu-devel@nongnu.org; Thu, 06 May 2010 04:35:48 -0400 Received: from [140.186.70.92] (port=49457 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9wYc-00015C-Cq for qemu-devel@nongnu.org; Thu, 06 May 2010 04:35:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9wYZ-0007LR-7D for qemu-devel@nongnu.org; Thu, 06 May 2010 04:35:46 -0400 Received: from iksaif.net ([88.191.73.63]:49404) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9wYY-0007Km-WE for qemu-devel@nongnu.org; Thu, 06 May 2010 04:35:43 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 11BDFC9001B; Thu, 6 May 2010 10:39:09 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Thu, 6 May 2010 10:39:05 +0200 Message-Id: <1273135146-11093-3-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1273135146-11093-1-git-send-email-corentincj@iksaif.net> References: <1273135146-11093-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori Subject: [Qemu-devel] [PATCH 3/4] vnc: only use a single zlib stream X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org According to http://tigervnc.org/cgi-bin/rfbproto#zlib-encoding Signed-off-by: Corentin Chary --- vnc-encoding-zlib.c | 12 +++++------- vnc.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c index 4a495ad..6a16a79 100644 --- a/vnc-encoding-zlib.c +++ b/vnc-encoding-zlib.c @@ -54,9 +54,9 @@ static void vnc_zlib_start(VncState *vs) vs->output = vs->zlib; } -static int vnc_zlib_stop(VncState *vs, int stream_id) +static int vnc_zlib_stop(VncState *vs) { - z_streamp zstream = &vs->zlib_stream[stream_id]; + z_streamp zstream = &vs->zlib_stream; int previous_out; // switch back to normal output/zlib buffers @@ -70,7 +70,7 @@ static int vnc_zlib_stop(VncState *vs, int stream_id) if (zstream->opaque != vs) { int err; - VNC_DEBUG("VNC: initializing zlib stream %d\n", stream_id); + VNC_DEBUG("VNC: initializing zlib stream\n"); VNC_DEBUG("VNC: opaque = %p | vs = %p\n", zstream->opaque, vs); zstream->zalloc = zalloc; zstream->zfree = zfree; @@ -122,7 +122,7 @@ void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) // compress the stream vnc_zlib_start(vs); vnc_raw_send_framebuffer_update(vs, x, y, w, h); - bytes_written = vnc_zlib_stop(vs, 0); + bytes_written = vnc_zlib_stop(vs); if (bytes_written == -1) return; @@ -136,7 +136,5 @@ void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) void vnc_zlib_init(VncState *vs) { - int i; - for (i=0; i<(sizeof(vs->zlib_stream) / sizeof(z_stream)); i++) - vs->zlib_stream[i].opaque = NULL; + vs->zlib_stream.opaque = NULL; } diff --git a/vnc.h b/vnc.h index 1aa71b0..dfdb240 100644 --- a/vnc.h +++ b/vnc.h @@ -173,7 +173,7 @@ struct VncState /* Zlib */ Buffer zlib; Buffer zlib_tmp; - z_stream zlib_stream[4]; + z_stream zlib_stream; Notifier mouse_mode_notifier;