diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2019-06-18 14:43:20 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-08-15 13:22:13 -0500 |
| commit | 962b7b3d4c3aed241ec28ea712ec9079ac98d3ad (patch) | |
| tree | 54233fbaefe64e3933393dabeda8012c1b013f5b /block/nbd.c | |
| parent | 7fa5c5657f11096101f5be18fe1f7395776be5a6 (diff) | |
block/nbd: split connection_co start out of nbd_client_connect
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 <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190618114328.55249-2-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/nbd.c')
| -rw-r--r-- | block/nbd.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/block/nbd.c b/block/nbd.c index 57c1a20581..c16d02528b 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1231,14 +1231,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); @@ -1269,14 +1263,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) |