[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 1/7] block/nbd-client: split connection_co start
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v6 1/7] block/nbd-client: split connection_co start out of nbd_client_connect |
Date: |
Thu, 11 Apr 2019 20:27:03 +0300 |
nbd_client_connect is going to be used from connection_co, so, let's
refactor nbd_client_connect in advance, leaving io channel
configuration all in nbd_client_connect.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/nbd-client.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 790ecc1ee1..facf8f8099 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -1180,12 +1180,8 @@ static int nbd_client_connect(BlockDriverState *bs,
object_ref(OBJECT(client->ioc));
}
- /* Now that we're connected, set the socket to be non-blocking and
- * kick the reply mechanism. */
qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL);
- client->connection_co = qemu_coroutine_create(nbd_connection_entry,
client);
- bdrv_inc_in_flight(bs);
- nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs));
+ qio_channel_attach_aio_context(client->ioc, bdrv_get_aio_context(bs));
logout("Established connection with NBD server\n");
return 0;
@@ -1215,12 +1211,22 @@ int nbd_client_init(BlockDriverState *bs,
const char *x_dirty_bitmap,
Error **errp)
{
+ int ret;
NBDClientSession *client = nbd_get_client_session(bs);
client->bs = bs;
qemu_co_mutex_init(&client->send_mutex);
qemu_co_queue_init(&client->free_sema);
- return nbd_client_connect(bs, saddr, export, tlscreds, hostname,
- x_dirty_bitmap, errp);
+ ret = nbd_client_connect(bs, saddr, export, tlscreds, hostname,
+ x_dirty_bitmap, errp);
+ if (ret < 0) {
+ return ret;
+ }
+
+ client->connection_co = qemu_coroutine_create(nbd_connection_entry,
client);
+ bdrv_inc_in_flight(bs);
+ aio_co_schedule(bdrv_get_aio_context(bs), client->connection_co);
+
+ return 0;
}
--
2.18.0
- [Qemu-devel] [PATCH v6 0/7] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 4/7] block/nbd: add cmdline and qapi parameter reconnect-delay, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 7/7] iotests: test nbd reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 1/7] block/nbd-client: split connection_co start out of nbd_client_connect,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v6 5/7] qemu-coroutine-sleep: introduce qemu_co_sleep_wake, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 3/7] block/nbd-client: move from quit to state, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 2/7] block/nbd-client: use non-blocking io channel for nbd negotiation, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 6/7] block/nbd-client: nbd reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- Re: [Qemu-devel] [PATCH v6 0/7] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/30