Commit 2566378d authored by Jens Freimann's avatar Jens Freimann Committed by Michael S. Tsirkin
Browse files

libvhost-user: quit when no more data received 



End processing of messages when VHOST_USER_NONE
is received.

Without this we run into a vubr_panic() call and get
"PANIC: Unhandled request: 0"

Signed-off-by: default avatarJens Freimann <jfreiman@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0f8c289a

contrib/libvhost-user/libvhost-user.c

+3 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ vu_message_read(VuDev *dev, int conn_fd, VhostUserMsg *vmsg) 
        rc = recvmsg(conn_fd, &msg, 0);

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



    if (rc <= 0) {

    if (rc < 0) {

        vu_panic(dev, "Error while recvmsg: %s", strerror(errno));

        return false;

    }
@@ -806,6 +806,8 @@ vu_process_message(VuDev *dev, VhostUserMsg *vmsg) 
        return vu_get_queue_num_exec(dev, vmsg);

    case VHOST_USER_SET_VRING_ENABLE:

        return vu_set_vring_enable_exec(dev, vmsg);

    case VHOST_USER_NONE:

        break;

    default:

        vmsg_close_fds(vmsg);

        vu_panic(dev, "Unhandled request: %d", vmsg->request);