Commit 917d7dd7 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

vhost-user: wrap some read/write with retry handling 



Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20190308140454.32437-6-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 60798655

hw/virtio/vhost-user.c

+12 −3
Original line number Diff line number Diff line
@@ -968,7 +968,10 @@ static void slave_read(void *opaque) 
    iov.iov_base = &hdr;

    iov.iov_len = VHOST_USER_HDR_SIZE;



    do {

        size = recvmsg(u->slave_fd, &msgh, 0);

    } while (size < 0 && (errno == EINTR || errno == EAGAIN));



    if (size != VHOST_USER_HDR_SIZE) {

        error_report("Failed to read from slave.");

        goto err;
@@ -997,7 +1000,10 @@ static void slave_read(void *opaque) 
    }



    /* Read payload */

    do {

        size = read(u->slave_fd, &payload, hdr.size);

    } while (size < 0 && (errno == EINTR || errno == EAGAIN));



    if (size != hdr.size) {

        error_report("Failed to read payload from slave.");

        goto err;
@@ -1045,7 +1051,10 @@ static void slave_read(void *opaque) 
        iovec[1].iov_base = &payload;

        iovec[1].iov_len = hdr.size;



        do {

            size = writev(u->slave_fd, iovec, ARRAY_SIZE(iovec));

        } while (size < 0 && (errno == EINTR || errno == EAGAIN));



        if (size != VHOST_USER_HDR_SIZE + hdr.size) {

            error_report("Failed to send msg reply to slave.");

            goto err;