Received: from eggs.gnu.org ([2001:4830:134:3::10]:53687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoqE9-0005Bc-Ao for qemu-devel@nongnu.org; Thu, 22 Feb 2018 07:43:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoqE5-0004ML-Fn for qemu-devel@nongnu.org; Thu, 22 Feb 2018 07:43:57 -0500 Received: from forward105p.mail.yandex.net ([77.88.28.108]:49844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eoqE5-0004Jb-2S for qemu-devel@nongnu.org; Thu, 22 Feb 2018 07:43:53 -0500 From: Aleksey Kuleshov In-Reply-To: <20180222121351.26191-1-berrange@redhat.com> References: <20180222121351.26191-1-berrange@redhat.com> MIME-Version: 1.0 Message-Id: <1900481519303427@web43g.yandex.ru> Date: Thu, 22 Feb 2018 15:43:47 +0300 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v1] chardev: fix handling of EAGAIN for TCP chardev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?B?RGFuaWVsIFAuIEJlcnJhbmfDqQ==?= , "qemu-devel@nongnu.org" Cc: Paolo Bonzini , =?utf-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Thank you, Daniel! 22.02.2018, 15:14, "Daniel P. Berrang=C3=A9" : > When this commit was applied > > =C2=A0=C2=A0commit 9894dc0cdcc397ee5b26370bc53da6d360a363c2 > =C2=A0=C2=A0Author: Daniel P. Berrange > =C2=A0=C2=A0Date: Tue Jan 19 11:14:29 2016 +0000 > > =C2=A0=C2=A0=C2=A0=C2=A0char: convert from GIOChannel to QIOChannel > > The tcp_chr_recv() function was changed to return QIO_CHANNEL_ERR_BLOCK > which corresonds to -2. As such the handling for EAGAIN was able to be > removed from tcp_chr_read(). Unfortunately in a later commit: > > =C2=A0=C2=A0commit b6572b4f97a7b126c7b24e165893ed9fe3d72e1f > =C2=A0=C2=A0Author: Marc-Andr=C3=A9 Lureau > =C2=A0=C2=A0Date: Fri Mar 11 18:55:24 2016 +0100 > > =C2=A0=C2=A0=C2=A0=C2=A0char: translate from QIOChannel error to errno > > The tcp_chr_recv() function was changed back to return -1, with errno > set to EAGAIN, without also re-addding support for this to tcp_chr_read= () > > Reported-by: Aleksey Kuleshov > Signed-off-by: Daniel P. Berrang=C3=A9 > --- > =C2=A0chardev/char-socket.c | 2 +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > index bdd6cff5f6..b15682c362 100644 > --- a/chardev/char-socket.c > +++ b/chardev/char-socket.c > @@ -449,7 +449,7 @@ static gboolean tcp_chr_read(QIOChannel *chan, GIOC= ondition cond, void *opaque) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0len =3D s->max_si= ze; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0size =3D tcp_chr_recv(chr, (void *)buf, l= en); > - if (size =3D=3D 0 || size =3D=3D -1) { > + if (size =3D=3D 0 || (size =3D=3D -1 && errno !=3D EAGAIN)) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* connection clo= sed */ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0tcp_chr_disconnec= t(chr); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else if (size > 0) { > -- > 2.14.3