From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYWBj-0005h7-Ch for qemu-devel@nongnu.org; Thu, 28 Jun 2018 08:38:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYWBh-0004oU-Ri for qemu-devel@nongnu.org; Thu, 28 Jun 2018 08:38:15 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37306 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fYWBh-0004nT-Nd for qemu-devel@nongnu.org; Thu, 28 Jun 2018 08:38:13 -0400 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 28 Jun 2018 13:38:07 +0100 Message-Id: <20180628123808.12165-2-berrange@redhat.com> In-Reply-To: <20180628123808.12165-1-berrange@redhat.com> References: <20180628123808.12165-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v3 1/2] socket: don't free msgfds if error equals EAGAIN List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , linzhecheng From: linzhecheng If we see EAGAIN, no data was sent over the socket, so we still have to retry sending of msgfds next time. Signed-off-by: linzhecheng Signed-off-by: Daniel P. Berrang=C3=A9 --- chardev/char-socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 159e69c3b1..17519ec589 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -134,8 +134,8 @@ static int tcp_chr_write(Chardev *chr, const uint8_t = *buf, int len) s->write_msgfds, s->write_msgfds_num); =20 - /* free the written msgfds, no matter what */ - if (s->write_msgfds_num) { + /* free the written msgfds in any cases other than errno=3D=3DEA= GAIN */ + if (EAGAIN !=3D errno && s->write_msgfds_num) { g_free(s->write_msgfds); s->write_msgfds =3D 0; s->write_msgfds_num =3D 0; --=20 2.17.1