mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-09-02 01:43:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

util: Rename and make global vu_remove_watch()

Browse source 
vu_remove_watch() is used in vhost_user.c to remove an fd from the global
epoll set.  There's nothing really vhost user specific about it though,
so rename, move to util.c and use it in a bunch of places outside
vhost_user.c where it makes things marginally more readable.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2025-01-30 17:52:11 +11:00 • committed by Stefano Brivio
commit 0349cf637f
9 changed files with 25 additions and 27 deletions

21
vhost_user.c
View file

@ -162,17 +162,6 @@ static void vmsg_close_fds(const struct vhost_user_msg *vmsg)
close(vmsg->fds[i]);
}
/**
* vu_remove_watch() - Remove a file descriptor from our passt epoll
* file descriptor
* @vdev: vhost-user device
* @fd: file descriptor to remove
*/
static void vu_remove_watch(const struct vu_dev *vdev, int fd)
{
epoll_ctl(vdev->context->epollfd, EPOLL_CTL_DEL, fd, NULL);
}
/**
* vmsg_set_reply_u64() - Set reply payload.u64 and clear request flags
* and fd_num
@ -748,7 +737,7 @@ static bool vu_get_vring_base_exec(struct vu_dev *vdev,
vdev->vq[idx].call_fd = -1;
}
if (vdev->vq[idx].kick_fd != -1) {
vu_remove_watch(vdev, vdev->vq[idx].kick_fd);
epoll_del(vdev->context, vdev->vq[idx].kick_fd);
close(vdev->vq[idx].kick_fd);
vdev->vq[idx].kick_fd = -1;
}
@ -816,7 +805,7 @@ static bool vu_set_vring_kick_exec(struct vu_dev *vdev,
vu_check_queue_msg_file(msg);
if (vdev->vq[idx].kick_fd != -1) {
vu_remove_watch(vdev, vdev->vq[idx].kick_fd);
epoll_del(vdev->context, vdev->vq[idx].kick_fd);
close(vdev->vq[idx].kick_fd);
vdev->vq[idx].kick_fd = -1;
}
@ -1063,7 +1052,7 @@ static bool vu_set_device_state_fd_exec(struct vu_dev *vdev,
die("Invalide device_state_fd direction: %d", direction);
if (vdev->device_state_fd != -1) {
vu_remove_watch(vdev, vdev->device_state_fd);
epoll_del(vdev->context, vdev->device_state_fd);
close(vdev->device_state_fd);
}
@ -1145,7 +1134,7 @@ void vu_cleanup(struct vu_dev *vdev)
vq->err_fd = -1;
}
if (vq->kick_fd != -1) {
vu_remove_watch(vdev, vq->kick_fd);
epoll_del(vdev->context, vq->kick_fd);
close(vq->kick_fd);
vq->kick_fd = -1;
}
@ -1169,7 +1158,7 @@ void vu_cleanup(struct vu_dev *vdev)
vu_close_log(vdev);
if (vdev->device_state_fd != -1) {
vu_remove_watch(vdev, vdev->device_state_fd);
epoll_del(vdev->context, vdev->device_state_fd);
close(vdev->device_state_fd);
vdev->device_state_fd = -1;
vdev->device_state_result = -1;