diff options
author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-06-10 13:07:59 +0300 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2021-06-18 12:21:22 -0500 |
commit | 97cf89259e4e0455c3b2742911737de5969dc0de (patch) | |
tree | 7c228cf801d332fe1a9ce6351b9c34db56c0bdc2 | |
parent | 51edbf537d2cbf97c8e9defd098b95ca8a18aa8c (diff) | |
download | qemu-97cf89259e4e0455c3b2742911737de5969dc0de.zip qemu-97cf89259e4e0455c3b2742911737de5969dc0de.tar.gz qemu-97cf89259e4e0455c3b2742911737de5969dc0de.tar.bz2 |
nbd/client-connection: add option for non-blocking connection attempt
We'll need a possibility of non-blocking nbd_co_establish_connection(),
so that it returns immediately, and it returns success only if a
connections was previously established in background.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210610100802.5888-30-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
-rw-r--r-- | block/nbd.c | 2 | ||||
-rw-r--r-- | include/block/nbd.h | 2 | ||||
-rw-r--r-- | nbd/client-connection.c | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/block/nbd.c b/block/nbd.c index 8caeafc..bf2e939 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -364,7 +364,7 @@ static int coroutine_fn nbd_co_do_establish_connection(BlockDriverState *bs, assert(!s->ioc); - s->ioc = nbd_co_establish_connection(s->conn, &s->info, errp); + s->ioc = nbd_co_establish_connection(s->conn, &s->info, true, errp); if (!s->ioc) { return -ECONNREFUSED; } diff --git a/include/block/nbd.h b/include/block/nbd.h index 10c8a0b..78d101b 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -420,7 +420,7 @@ void nbd_client_connection_release(NBDClientConnection *conn); QIOChannel *coroutine_fn nbd_co_establish_connection(NBDClientConnection *conn, NBDExportInfo *info, - Error **errp); + bool blocking, Error **errp); void coroutine_fn nbd_co_establish_connection_cancel(NBDClientConnection *conn); diff --git a/nbd/client-connection.c b/nbd/client-connection.c index 955edaf..7123b1e 100644 --- a/nbd/client-connection.c +++ b/nbd/client-connection.c @@ -266,6 +266,8 @@ void nbd_client_connection_release(NBDClientConnection *conn) * otherwise the thread is not running, so start a thread and wait for * completion * + * If @blocking is false, don't wait for the thread, return immediately. + * * If @info is not NULL, also do nbd-negotiation after successful connection. * In this case info is used only as out parameter, and is fully initialized by * nbd_co_establish_connection(). "IN" fields of info as well as related only to @@ -274,7 +276,7 @@ void nbd_client_connection_release(NBDClientConnection *conn) */ QIOChannel *coroutine_fn nbd_co_establish_connection(NBDClientConnection *conn, NBDExportInfo *info, - Error **errp) + bool blocking, Error **errp) { QemuThread thread; @@ -315,6 +317,10 @@ nbd_co_establish_connection(NBDClientConnection *conn, NBDExportInfo *info, connect_thread_func, conn, QEMU_THREAD_DETACHED); } + if (!blocking) { + return NULL; + } + conn->wait_co = qemu_coroutine_self(); } |