Commit 4e39f57c authored by Markus Armbruster's avatar Markus Armbruster Committed by Juan Quintela
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent cf221323

migration/qemu-file-unix.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

        }

     }