[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 28/32] block/nbd: split nbd_co_do_establish_connection out of
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 28/32] block/nbd: split nbd_co_do_establish_connection out of nbd_reconnect_attempt |
Date: |
Thu, 10 Jun 2021 13:07:58 +0300 |
Split out the part that we want to reuse for nbd_open().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/nbd.c | 80 ++++++++++++++++++++++++++++-------------------------
1 file changed, 42 insertions(+), 38 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 411435c155..8caeafc8d3 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -356,11 +356,50 @@ static int nbd_handle_updated_info(BlockDriverState *bs,
Error **errp)
return 0;
}
-static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
+static int coroutine_fn nbd_co_do_establish_connection(BlockDriverState *bs,
+ Error **errp)
{
+ BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
int ret;
- AioContext *aio_context = bdrv_get_aio_context(s->bs);
+ assert(!s->ioc);
+
+ s->ioc = nbd_co_establish_connection(s->conn, &s->info, errp);
+ if (!s->ioc) {
+ return -ECONNREFUSED;
+ }
+
+ ret = nbd_handle_updated_info(s->bs, NULL);
+ if (ret < 0) {
+ /*
+ * We have connected, but must fail for other reasons.
+ * Send NBD_CMD_DISC as a courtesy to the server.
+ */
+ NBDRequest request = { .type = NBD_CMD_DISC };
+
+ nbd_send_request(s->ioc, &request);
+
+ object_unref(OBJECT(s->ioc));
+ s->ioc = NULL;
+
+ return ret;
+ }
+
+ qio_channel_set_blocking(s->ioc, false, NULL);
+ qio_channel_attach_aio_context(s->ioc, bdrv_get_aio_context(bs));
+
+ yank_register_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name), nbd_yank,
+ bs);
+
+ /* successfully connected */
+ s->state = NBD_CLIENT_CONNECTED;
+ qemu_co_queue_restart_all(&s->free_sema);
+
+ return 0;
+}
+
+static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
+{
if (!nbd_client_connecting(s)) {
return;
}
@@ -398,42 +437,7 @@ static coroutine_fn void
nbd_reconnect_attempt(BDRVNBDState *s)
s->ioc = NULL;
}
- s->ioc = nbd_co_establish_connection(s->conn, &s->info, NULL);
- if (!s->ioc) {
- ret = -ECONNREFUSED;
- goto out;
- }
-
- qio_channel_set_blocking(QIO_CHANNEL(s->ioc), false, NULL);
- qio_channel_attach_aio_context(QIO_CHANNEL(s->ioc), aio_context);
-
- yank_register_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name), nbd_yank,
- s->bs);
-
- ret = nbd_handle_updated_info(s->bs, NULL);
- if (ret < 0) {
- /*
- * We have connected, but must fail for other reasons.
- * Send NBD_CMD_DISC as a courtesy to the server.
- */
- NBDRequest request = { .type = NBD_CMD_DISC };
-
- nbd_send_request(s->ioc, &request);
-
- yank_unregister_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name),
- nbd_yank, s->bs);
- object_unref(OBJECT(s->ioc));
- s->ioc = NULL;
-
- return;
- }
-
-out:
- if (ret >= 0) {
- /* successfully connected */
- s->state = NBD_CLIENT_CONNECTED;
- qemu_co_queue_restart_all(&s->free_sema);
- }
+ nbd_co_do_establish_connection(s->bs, NULL);
}
static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDState *s)
--
2.29.2
- [PATCH v4 27/32] block-coroutine-wrapper: allow non bdrv_ prefix, (continued)
- [PATCH v4 27/32] block-coroutine-wrapper: allow non bdrv_ prefix, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 26/32] nbd/client-connection: return only one io channel, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 25/32] block/nbd: drop BDRVNBDState::sioc, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 16/32] block/nbd: introduce nbd_client_connection_release(), Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 23/32] block/nbd: use negotiation of NBDClientConnection, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 22/32] block/nbd: split nbd_handle_updated_info out of nbd_client_handshake(), Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 30/32] block/nbd: reuse nbd_co_do_establish_connection() in nbd_open(), Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 24/32] block/nbd: don't touch s->sioc in nbd_teardown_connection(), Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 29/32] nbd/client-connection: add option for non-blocking connection attempt, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 28/32] block/nbd: split nbd_co_do_establish_connection out of nbd_reconnect_attempt,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 31/32] block/nbd: add nbd_client_connected() helper, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 32/32] block/nbd: safer transition to receiving request, Vladimir Sementsov-Ogievskiy, 2021/06/10
- Re: [PATCH v4 00/32] block/nbd: rework client connection, Eric Blake, 2021/06/11