[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 2/7] libvhost-user: Remove unnecessary FD flag ch
From: |
elohimes |
Subject: |
[Qemu-devel] [PATCH v6 2/7] libvhost-user: Remove unnecessary FD flag check for event file descriptors |
Date: |
Mon, 18 Feb 2019 18:27:43 +0800 |
From: Xie Yongji <address@hidden>
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 <address@hidden>
Signed-off-by: Zhang Yu <address@hidden>
---
contrib/libvhost-user/libvhost-user.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/contrib/libvhost-user/libvhost-user.c
b/contrib/libvhost-user/libvhost-user.c
index 3f14b4138b..16fec3a3fd 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -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].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];
- }
+ 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];
- }
+ dev->vq[index].err_fd = vmsg->fds[0];
return false;
}
--
2.17.1
- [Qemu-devel] [PATCH v6 0/7] vhost-user-blk: Add support for backend reconnecting, elohimes, 2019/02/18
- [Qemu-devel] [PATCH v6 1/7] vhost-user: Support transferring inflight buffer between qemu and backend, elohimes, 2019/02/18
- [Qemu-devel] [PATCH v6 5/7] vhost-user-blk: Add support to get/set inflight buffer, elohimes, 2019/02/18
- [Qemu-devel] [PATCH v6 4/7] libvhost-user: Support tracking inflight I/O in shared memory, elohimes, 2019/02/18
- [Qemu-devel] [PATCH v6 6/7] vhost-user-blk: Add support to reconnect backend, elohimes, 2019/02/18
- [Qemu-devel] [PATCH v6 7/7] contrib/vhost-user-blk: enable inflight I/O tracking, elohimes, 2019/02/18
- [Qemu-devel] [PATCH v6 2/7] libvhost-user: Remove unnecessary FD flag check for event file descriptors,
elohimes <=
- [Qemu-devel] [PATCH v6 3/7] libvhost-user: Introduce vu_queue_map_desc(), elohimes, 2019/02/18
- Re: [Qemu-devel] [PATCH v6 0/7] vhost-user-blk: Add support for backend reconnecting, Michael S. Tsirkin, 2019/02/20