From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Gjr-0001bb-Hb for qemu-devel@nongnu.org; Wed, 02 Dec 2015 18:23:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Gjq-0002GP-6Z for qemu-devel@nongnu.org; Wed, 02 Dec 2015 18:23:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Gjq-0002GJ-1D for qemu-devel@nongnu.org; Wed, 02 Dec 2015 18:23:06 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 877A968E18 for ; Wed, 2 Dec 2015 23:23:05 +0000 (UTC) From: Juan Quintela Date: Thu, 3 Dec 2015 00:23:00 +0100 Message-Id: <1449098581-6628-2-git-send-email-quintela@redhat.com> In-Reply-To: <1449098581-6628-1-git-send-email-quintela@redhat.com> References: <1449098581-6628-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 1/2] migration: Clean up use of g_poll() in socket_writev_buffer() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com, Markus Armbruster From: Markus Armbruster socket_writev_buffer() writes in a loop, using g_poll() to block. If g_poll() fails, it tries to write more before the file descriptor is ready. In theory, this could go into a tight loop. In practice, errors other than EINTR are really unlikely, and when they happen, we're probably screwed anyway, so we can just as well loop. Clean it up a bit: retry poll on EINTR, keep ignoring other errors. Signed-off-by: Markus Armbruster Reviewed-by: Paolo Bonzini Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/qemu-file-unix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/qemu-file-unix.c b/migration/qemu-file-unix.c index c503b02..6ca53e7 100644 --- a/migration/qemu-file-unix.c +++ b/migration/qemu-file-unix.c @@ -72,7 +72,8 @@ static ssize_t socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt, pfd.fd = s->fd; pfd.events = G_IO_OUT | G_IO_ERR; pfd.revents = 0; - g_poll(&pfd, 1 /* 1 fd */, -1 /* no timeout */); + TFR(err = g_poll(&pfd, 1, -1 /* no timeout */)); + /* Errors other than EINTR intentionally ignored */ } } -- 2.5.0