From: Markus Armbruster Date: Tue, 1 Dec 2015 13:34:14 +0000 (+0100) Subject: migration: Clean up use of g_poll() in socket_writev_buffer() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e39f57c0010b689ffa15658ff063006b45309db;p=qemu.git migration: Clean up use of g_poll() in socket_writev_buffer() 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 --- diff --git a/migration/qemu-file-unix.c b/migration/qemu-file-unix.c index c503b027a9..6ca53e7d67 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 */ } }