[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/7] vhost-user: Factor out duplicated slave_fd teardown code
From: |
Greg Kurz |
Subject: |
[PATCH v2 3/7] vhost-user: Factor out duplicated slave_fd teardown code |
Date: |
Fri, 12 Mar 2021 10:22:08 +0100 |
Signed-off-by: Greg Kurz <groug@kaod.org>
---
hw/virtio/vhost-user.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index acde1d293684..cb0c98f30a8d 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1392,6 +1392,13 @@ static int
vhost_user_slave_handle_vring_host_notifier(struct vhost_dev *dev,
return 0;
}
+static void close_slave_channel(struct vhost_user *u)
+{
+ qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL);
+ close(u->slave_fd);
+ u->slave_fd = -1;
+}
+
static void slave_read(void *opaque)
{
struct vhost_dev *dev = opaque;
@@ -1507,9 +1514,7 @@ static void slave_read(void *opaque)
goto fdcleanup;
err:
- qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL);
- close(u->slave_fd);
- u->slave_fd = -1;
+ close_slave_channel(u);
fdcleanup:
for (i = 0; i < fdsize; i++) {
@@ -1560,9 +1565,7 @@ static int vhost_setup_slave_channel(struct vhost_dev
*dev)
out:
close(sv[1]);
if (ret) {
- qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL);
- close(u->slave_fd);
- u->slave_fd = -1;
+ close_slave_channel(u);
}
return ret;
@@ -1915,9 +1918,7 @@ static int vhost_user_backend_cleanup(struct vhost_dev
*dev)
u->postcopy_fd.handler = NULL;
}
if (u->slave_fd >= 0) {
- qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL);
- close(u->slave_fd);
- u->slave_fd = -1;
+ close_slave_channel(u);
}
g_free(u->region_rb);
u->region_rb = NULL;
--
2.26.2
- [PATCH v2 0/7] virtiofsd: Avoid potential deadlocks, Greg Kurz, 2021/03/12
- [PATCH v2 1/7] vhost-user: Drop misleading EAGAIN checks in slave_read(), Greg Kurz, 2021/03/12
- [PATCH v2 2/7] vhost-user: Fix double-close on slave_read() error path, Greg Kurz, 2021/03/12
- [PATCH v2 4/7] vhost-user: Convert slave channel to QIOChannelSocket, Greg Kurz, 2021/03/12
- [PATCH v2 3/7] vhost-user: Factor out duplicated slave_fd teardown code,
Greg Kurz <=
- [PATCH v2 6/7] vhost-user: Monitor slave channel in vhost_user_read(), Greg Kurz, 2021/03/12
- [PATCH v2 5/7] vhost-user: Introduce nested event loop in vhost_user_read(), Greg Kurz, 2021/03/12
- [PATCH v2 7/7] virtiofsd: Release vu_dispatch_lock when stopping queue, Greg Kurz, 2021/03/12