From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3l4Y-0001Uj-9I for qemu-devel@nongnu.org; Tue, 01 Dec 2015 08:34:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3l4T-00050Y-9w for qemu-devel@nongnu.org; Tue, 01 Dec 2015 08:34:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3l4T-000505-4x for qemu-devel@nongnu.org; Tue, 01 Dec 2015 08:34:17 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id DAC445BA08 for ; Tue, 1 Dec 2015 13:34:16 +0000 (UTC) From: Markus Armbruster Date: Tue, 1 Dec 2015 14:34:14 +0100 Message-Id: <1448976854-10346-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] 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, quintela@redhat.com 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 --- Let me stress once again: this is *not* a bug fix, it's cleanup! If you don't like it, you can safely ignore it. We'll then mark the spot as intentional in the Coverity dashboard. 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.4.3