Commit 792468cc authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin
Browse files

libvhost-user: Remove unnecessary FD flag check for event file descriptors 



The vu_check_queue_msg_file() has checked the FD flag. So let's
delete the redundant check after it.

Signed-off-by: default avatarXie Yongji <xieyongji@baidu.com>
Signed-off-by: default avatarZhang Yu <zhangyu31@baidu.com>
Message-Id: <20190228085355.9614-3-xieyongji@baidu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 5ad204bf

contrib/libvhost-user/libvhost-user.c

+4 −10
Original line number Diff line number Diff line
@@ -907,10 +907,8 @@ vu_set_vring_kick_exec(VuDev *dev, VhostUserMsg *vmsg) 
        dev->vq[index].kick_fd = -1;

    }



    if (!(vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) {

    dev->vq[index].kick_fd = vmsg->fds[0];

    DPRINT("Got kick_fd: %d for vq: %d\n", vmsg->fds[0], index);

    }



    dev->vq[index].started = true;

    if (dev->iface->queue_set_started) {
@@ -995,9 +993,7 @@ vu_set_vring_call_exec(VuDev *dev, VhostUserMsg *vmsg) 
        dev->vq[index].call_fd = -1;

    }



    if (!(vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) {

    dev->vq[index].call_fd = vmsg->fds[0];

    }



    DPRINT("Got call_fd: %d for vq: %d\n", vmsg->fds[0], index);
@@ -1020,9 +1016,7 @@ vu_set_vring_err_exec(VuDev *dev, VhostUserMsg *vmsg) 
        dev->vq[index].err_fd = -1;

    }



    if (!(vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) {

    dev->vq[index].err_fd = vmsg->fds[0];

    }



    return false;

}