Commit 47e86b86 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Remove coroutine trampoline for preallocate_co() 



All callers are coroutine_fns now, so we can just directly call
preallocate_co().

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 061ca8a3

block/qcow2.c

+8 −43
Original line number Diff line number Diff line
@@ -2521,15 +2521,6 @@ static int qcow2_set_up_encryption(BlockDriverState *bs, 
    return ret;

}





typedef struct PreallocCo {

    BlockDriverState *bs;

    uint64_t offset;

    uint64_t new_length;



    int ret;

} PreallocCo;



/**

 * Preallocates metadata structures for data clusters between @offset (in the

 * guest disk) and @new_length (which is thus generally the new guest disk
@@ -2537,12 +2528,9 @@ typedef struct PreallocCo { 
 *

 * Returns: 0 on success, -errno on failure.

 */

static void coroutine_fn preallocate_co(void *opaque)

static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,

                                       uint64_t new_length)

{

    PreallocCo *params = opaque;

    BlockDriverState *bs = params->bs;

    uint64_t offset = params->offset;

    uint64_t new_length = params->new_length;

    uint64_t bytes;

    uint64_t host_offset = 0;

    unsigned int cur_bytes;
@@ -2557,7 +2545,7 @@ static void coroutine_fn preallocate_co(void *opaque) 
        ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,

                                         &host_offset, &meta);

        if (ret < 0) {

            goto done;

            return ret;

        }



        while (meta) {
@@ -2567,7 +2555,7 @@ static void coroutine_fn preallocate_co(void *opaque) 
            if (ret < 0) {

                qcow2_free_any_clusters(bs, meta->alloc_offset,

                                        meta->nb_clusters, QCOW2_DISCARD_NEVER);

                goto done;

                return ret;

            }



            /* There are no dependent requests, but we need to remove our
@@ -2594,34 +2582,11 @@ static void coroutine_fn preallocate_co(void *opaque) 
        ret = bdrv_pwrite(bs->file, (host_offset + cur_bytes) - 1,

                          &data, 1);

        if (ret < 0) {

            goto done;

            return ret;

        }

    }



    ret = 0;



done:

    params->ret = ret;

}



static int preallocate(BlockDriverState *bs,

                       uint64_t offset, uint64_t new_length)

{

    PreallocCo params = {

        .bs         = bs,

        .offset     = offset,

        .new_length = new_length,

        .ret        = -EINPROGRESS,

    };



    if (qemu_in_coroutine()) {

        preallocate_co(&params);

    } else {

        Coroutine *co = qemu_coroutine_create(preallocate_co, &params);

        bdrv_coroutine_enter(bs, co);

        BDRV_POLL_WHILE(bs, params.ret == -EINPROGRESS);

    }

    return params.ret;

    return 0;

}



/* qcow2_refcount_metadata_size:
@@ -3039,7 +3004,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) 
    if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {

        BDRVQcow2State *s = blk_bs(blk)->opaque;

        qemu_co_mutex_lock(&s->lock);

        ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);

        ret = preallocate_co(blk_bs(blk), 0, qcow2_opts->size);

        qemu_co_mutex_unlock(&s->lock);



        if (ret < 0) {
@@ -3547,7 +3512,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, 
        break;



    case PREALLOC_MODE_METADATA:

        ret = preallocate(bs, old_length, offset);

        ret = preallocate_co(bs, old_length, offset);

        if (ret < 0) {

            error_setg_errno(errp, -ret, "Preallocation failed");

            goto fail;