mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-08-13 02:33:12 +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

6
vu_common.c
View file

@ -325,8 +325,7 @@ void vu_migrate(struct vu_dev *vdev, uint32_t events)
/* value to be returned by VHOST_USER_CHECK_DEVICE_STATE */
vdev->device_state_result = ret == -1 ? -1 : 0;
/* Closing the file descriptor signals the end of transfer */
epoll_ctl(vdev->context->epollfd, EPOLL_CTL_DEL,
vdev->device_state_fd, NULL);
epoll_del(vdev->context, vdev->device_state_fd);
close(vdev->device_state_fd);
vdev->device_state_fd = -1;
} else if (events & EPOLLIN) {
@ -346,8 +345,7 @@ void vu_migrate(struct vu_dev *vdev, uint32_t events)
debug("Closing migration channel");
/* The end of file signals the end of the transfer. */
epoll_ctl(vdev->context->epollfd, EPOLL_CTL_DEL,
vdev->device_state_fd, NULL);
epoll_del(vdev->context, vdev->device_state_fd);
close(vdev->device_state_fd);
vdev->device_state_fd = -1;
}