From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36359)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pl@kamp.de>)
	id 1ZfPTY-0002i8-2h
	for qemu-devel@nongnu.org; Fri, 25 Sep 2015 05:39:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pl@kamp.de>) id 1ZfPTS-0003QK-Qw
	for qemu-devel@nongnu.org; Fri, 25 Sep 2015 05:39:31 -0400
Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:43763 helo=mx01.kamp.de)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pl@kamp.de>)
	id 1ZfPTS-0003Pt-8L
	for qemu-devel@nongnu.org; Fri, 25 Sep 2015 05:39:26 -0400
Message-ID: <56051645.70805@kamp.de>
Date: Fri, 25 Sep 2015 11:39:17 +0200
From: Peter Lieven <pl@kamp.de>
MIME-Version: 1.0
References: <1443084128-25552-1-git-send-email-kraxel@redhat.com>
	<1443084128-25552-11-git-send-email-kraxel@redhat.com>
In-Reply-To: <1443084128-25552-11-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=iso-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [RfC PATCH 10/10] vnc-jobs: move buffer reset,
 use new buffer move
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org

Am 24.09.2015 um 10:42 schrieb Gerd Hoffmann:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  ui/vnc-jobs.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 50e6b37..dfc5139 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -165,8 +165,7 @@ void vnc_jobs_consume_buffer(VncState *vs)
>  
>      vnc_lock_output(vs);
>      if (vs->jobs_buffer.offset) {
> -        vnc_write(vs, vs->jobs_buffer.buffer, vs->jobs_buffer.offset);
> -        qio_buffer_reset(&vs->jobs_buffer);
> +        qio_buffer_move(&vs->output, &vs->jobs_buffer);

vnc_write restores the output handler. you need to add:

diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index dfc5139..07e0445 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -29,6 +29,7 @@
 #include "vnc.h"
 #include "vnc-jobs.h"
 #include "qemu/sockets.h"
+#include "qemu/main-loop.h"
 #include "block/aio.h"
 
 /*
@@ -165,6 +166,9 @@ void vnc_jobs_consume_buffer(VncState *vs)
 
     vnc_lock_output(vs);
     if (vs->jobs_buffer.offset) {
+        if (qio_buffer_empty(&vs->output)) {
+            qemu_set_fd_handler(vs->csock, vnc_client_read, vnc_client_write, vs);
+        }
         qio_buffer_move(&vs->output, &vs->jobs_buffer);
     }
     flush = vs->csock != -1 && vs->abort != true;


or you get ocasional hangs.

Peter