Skip to content

Commit

Permalink
block/export: only acquire AioContext once for vhost_user_server_stop()
Browse files Browse the repository at this point in the history
vhost_user_server_stop() uses AIO_WAIT_WHILE(). AIO_WAIT_WHILE()
requires that AioContext is only acquired once.

Since blk_exp_request_shutdown() already acquires the AioContext it
shouldn't be acquired again in vhost_user_server_stop().

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20230323145853.1345527-1-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
stefanhaRH authored and kevmw committed Mar 27, 2023
1 parent bd2cd4a commit 2957dc4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions util/vhost-user-server.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,9 @@ static void vu_accept(QIONetListener *listener, QIOChannelSocket *sioc,
aio_context_release(server->ctx);
}

/* server->ctx acquired by caller */
void vhost_user_server_stop(VuServer *server)
{
aio_context_acquire(server->ctx);

qemu_bh_delete(server->restart_listener_bh);
server->restart_listener_bh = NULL;

Expand All @@ -366,8 +365,6 @@ void vhost_user_server_stop(VuServer *server)
AIO_WAIT_WHILE(server->ctx, server->co_trip);
}

aio_context_release(server->ctx);

if (server->listener) {
qio_net_listener_disconnect(server->listener);
object_unref(OBJECT(server->listener));
Expand Down

0 comments on commit 2957dc4

Please sign in to comment.