[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 1/9] block/nbd: split connection_co start out of
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v7 1/9] block/nbd: split connection_co start out of nbd_client_connect |
Date: |
Tue, 18 Jun 2019 14:43:20 +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>
Reviewed-by: Eric Blake <address@hidden>
---
block/nbd.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 81edabbf35..46a1de7220 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -1232,14 +1232,8 @@ static int nbd_client_connect(BlockDriverState *bs,
object_ref(OBJECT(s->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);
- s->connection_co = qemu_coroutine_create(nbd_connection_entry, s);
- bdrv_inc_in_flight(bs);
- nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs));
+ qio_channel_attach_aio_context(s->ioc, bdrv_get_aio_context(bs));
trace_nbd_client_connect_success(export);
@@ -1270,14 +1264,24 @@ static int nbd_client_init(BlockDriverState *bs,
const char *x_dirty_bitmap,
Error **errp)
{
+ int ret;
BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
s->bs = bs;
qemu_co_mutex_init(&s->send_mutex);
qemu_co_queue_init(&s->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;
+ }
+
+ s->connection_co = qemu_coroutine_create(nbd_connection_entry, s);
+ bdrv_inc_in_flight(bs);
+ aio_co_schedule(bdrv_get_aio_context(bs), s->connection_co);
+
+ return 0;
}
static int nbd_parse_uri(const char *filename, QDict *options)
--
2.18.0
- [Qemu-block] [PATCH v7 0/9] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 9/9] iotests: test nbd reconnect, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 5/9] block/nbd: refactor nbd connection parameters, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 3/9] block/nbd: move from quit to state, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 4/9] block/nbd: add cmdline and qapi parameter reconnect-delay, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 6/9] qemu-coroutine-sleep: introduce qemu_co_sleep_wake, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 2/9] block/nbd: use non-blocking io channel for nbd negotiation, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 7/9] qemu/units: add SI decimal units, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 8/9] block/nbd: nbd reconnect, Vladimir Sementsov-Ogievskiy, 2019/06/18
- [Qemu-block] [PATCH v7 1/9] block/nbd: split connection_co start out of nbd_client_connect,
Vladimir Sementsov-Ogievskiy <=