OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

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

Signed-off-by: Xie Yongji <xieyongji@baidu.com>
Signed-off-by: Zhang Yu <zhangyu31@baidu.com>
Message-Id: <20190228085355.9614-3-xieyongji@baidu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Xie Yongji 2019-02-28 16:53:50 +08:00 committed by Michael S. Tsirkin
parent 5ad204bf2a
commit 792468cc6f
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/libvhost-user/libvhost-user.c
View File

@ -907,10 +907,8 @@ vu_set_vring_kick_exec(VuDev *dev, VhostUserMsg *vmsg)
dev->vq[index].kick_fd = -1; dev->vq[index].kick_fd = -1;
} }
if (!(vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) { dev->vq[index].kick_fd = vmsg->fds[0];
dev->vq[index].kick_fd = vmsg->fds[0]; DPRINT("Got kick_fd: %d for vq: %d\n", vmsg->fds[0], index);
DPRINT("Got kick_fd: %d for vq: %d\n", vmsg->fds[0], index);
}
dev->vq[index].started = true; dev->vq[index].started = true;
if (dev->iface->queue_set_started) { 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; dev->vq[index].call_fd = -1;
} }
if (!(vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) { dev->vq[index].call_fd = vmsg->fds[0];
dev->vq[index].call_fd = vmsg->fds[0];
}
DPRINT("Got call_fd: %d for vq: %d\n", vmsg->fds[0], index); 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; dev->vq[index].err_fd = -1;
} }
if (!(vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) { dev->vq[index].err_fd = vmsg->fds[0];
dev->vq[index].err_fd = vmsg->fds[0];
}
return false; return false;
} }