Commit 4f578637 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction 



Now that bdrv_is_allocated detects coroutine context, the two can
use the same code.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 617ccb46

block.c

+4 −42
Original line number Diff line number Diff line
@@ -3144,7 +3144,7 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, 
 *  allocated/unallocated state.

 *

 */

int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,

int bdrv_is_allocated_above(BlockDriverState *top,

                            BlockDriverState *base,

                            int64_t sector_num,

                            int nb_sectors, int *pnum)
@@ -3183,44 +3183,6 @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top, 
    return 0;

}



/* Coroutine wrapper for bdrv_is_allocated_above() */

static void coroutine_fn bdrv_is_allocated_above_co_entry(void *opaque)

{

    BdrvCoIsAllocatedData *data = opaque;

    BlockDriverState *top = data->bs;

    BlockDriverState *base = data->base;



    data->ret = bdrv_co_is_allocated_above(top, base, data->sector_num,

                                           data->nb_sectors, data->pnum);

    data->done = true;

}



/*

 * Synchronous wrapper around bdrv_co_is_allocated_above().

 *

 * See bdrv_co_is_allocated_above() for details.

 */

int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,

                            int64_t sector_num, int nb_sectors, int *pnum)

{

    Coroutine *co;

    BdrvCoIsAllocatedData data = {

        .bs = top,

        .base = base,

        .sector_num = sector_num,

        .nb_sectors = nb_sectors,

        .pnum = pnum,

        .done = false,

    };



    co = qemu_coroutine_create(bdrv_is_allocated_above_co_entry);

    qemu_coroutine_enter(co, &data);

    while (!data.done) {

        qemu_aio_wait();

    }

    return data.ret;

}



const char *bdrv_get_encrypted_filename(BlockDriverState *bs)

{

    if (bs->backing_hd && bs->backing_hd->encrypted)

block/commit.c

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ wait: 
            break;

        }

        /* Copy if allocated above the base */

        ret = bdrv_co_is_allocated_above(top, base, sector_num,

        ret = bdrv_is_allocated_above(top, base, sector_num,

                                      COMMIT_BUFFER_SIZE / BDRV_SECTOR_SIZE,

                                      &n);

        copy = (ret == 1);

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void coroutine_fn mirror_run(void *opaque) 
        base = s->mode == MIRROR_SYNC_MODE_FULL ? NULL : bs->backing_hd;

        for (sector_num = 0; sector_num < end; ) {

            int64_t next = (sector_num | (sectors_per_chunk - 1)) + 1;

            ret = bdrv_co_is_allocated_above(bs, base,

            ret = bdrv_is_allocated_above(bs, base,

                                          sector_num, next - sector_num, &n);



            if (ret < 0) {

block/stream.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ wait: 
        } else {

            /* Copy if allocated in the intermediate images.  Limit to the

             * known-unallocated area [sector_num, sector_num+n).  */

            ret = bdrv_co_is_allocated_above(bs->backing_hd, base,

            ret = bdrv_is_allocated_above(bs->backing_hd, base,

                                          sector_num, n, &n);



            /* Finish early if end of backing file has been reached */

include/block/block.h

+0 −4
Original line number Diff line number Diff line
@@ -179,10 +179,6 @@ int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num, 
 */

int coroutine_fn bdrv_co_write_zeroes(BlockDriverState *bs, int64_t sector_num,

    int nb_sectors);

int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,

                                            BlockDriverState *base,

                                            int64_t sector_num,

                                            int nb_sectors, int *pnum);

BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,

    const char *backing_file);

int bdrv_get_backing_file_depth(BlockDriverState *bs);