Skip to content

Commit

Permalink
vhost-user: Factor out duplicated slave_fd teardown code
Browse files Browse the repository at this point in the history
Signed-off-by: Greg Kurz <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
Reviewed-by: Stefan Hajnoczi <[email protected]>
  • Loading branch information
gkurz authored and mstsirkin committed Mar 22, 2021
1 parent 9e06080 commit de62e49
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions hw/virtio/vhost-user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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++) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit de62e49

Please sign in to comment.