Commit 962b7b3d authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

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: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20190618114328.55249-2-vsementsov@virtuozzo.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 7fa5c565

block/nbd.c

+13 −9
Original line number Diff line number Diff line
@@ -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,

    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)