From patchwork Fri Sep 25 09:39:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 522705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 154751400A0 for ; Fri, 25 Sep 2015 19:40:30 +1000 (AEST) Received: from localhost ([::1]:53325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfPUS-0003vg-64 for incoming@patchwork.ozlabs.org; Fri, 25 Sep 2015 05:40:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) id 1ZfPTS-0003Pt-8L for qemu-devel@nongnu.org; Fri, 25 Sep 2015 05:39:26 -0400 Received: (qmail 2648 invoked by uid 89); 25 Sep 2015 09:39:24 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.7/20933. hbedv: 8.3.34.34/7.12.13.116. spamassassin: 3.4.0. Clear:RC:1(195.62.97.28):SA:0(-2.0/5.0):. Processed in 5.334306 secs); 25 Sep 2015 09:39:24 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-SHA encrypted); 25 Sep 2015 09:39:18 -0000 X-GL_Whitelist: yes Received: (qmail 7130 invoked from network); 25 Sep 2015 09:26:50 -0000 Received: from ac69.vpn.kamp-intra.net (HELO ?172.20.250.69?) (pl@kamp.de@172.20.250.69) by submission.kamp.de with ESMTPS (DHE-RSA-AES128-SHA encrypted) ESMTPA; 25 Sep 2015 09:26:50 -0000 Message-ID: <56051645.70805@kamp.de> Date: Fri, 25 Sep 2015 11:39:17 +0200 From: Peter Lieven User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Gerd Hoffmann , qemu-devel@nongnu.org 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> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Subject: Re: [Qemu-devel] [RfC PATCH 10/10] vnc-jobs: move buffer reset, use new buffer move X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Am 24.09.2015 um 10:42 schrieb Gerd Hoffmann: > Signed-off-by: Gerd Hoffmann > --- > 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: or you get ocasional hangs. Peter 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;