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

block: make bdrv_co_is_allocated static 



bdrv_is_allocated can detect coroutine context and go through a fast
path, similar to other block layer functions.

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 df2a6f29

block.c

+15 −9
Original line number Diff line number Diff line
@@ -2587,7 +2587,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, 
    if (flags & BDRV_REQ_COPY_ON_READ) {

        int pnum;



        ret = bdrv_co_is_allocated(bs, sector_num, nb_sectors, &pnum);

        ret = bdrv_is_allocated(bs, sector_num, nb_sectors, &pnum);

        if (ret < 0) {

            goto out;

        }
@@ -3061,7 +3061,8 @@ typedef struct BdrvCoIsAllocatedData { 
 * 'nb_sectors' is the max value 'pnum' should be set to.  If nb_sectors goes

 * beyond the end of the disk image it will be clamped.

 */

int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t sector_num,

static int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs,

                                             int64_t sector_num,

                                             int nb_sectors, int *pnum)

{

    int64_t n;
@@ -3112,11 +3113,16 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, 
        .done = false,

    };



    if (qemu_in_coroutine()) {

        /* Fast-path if already in coroutine context */

        bdrv_is_allocated_co_entry(&data);

    } else {

        co = qemu_coroutine_create(bdrv_is_allocated_co_entry);

        qemu_coroutine_enter(co, &data);

        while (!data.done) {

            qemu_aio_wait();

        }

    }

    return data.ret;

}
@@ -3143,7 +3149,7 @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top, 
    intermediate = top;

    while (intermediate && intermediate != base) {

        int pnum_inter;

        ret = bdrv_co_is_allocated(intermediate, sector_num, nb_sectors,

        ret = bdrv_is_allocated(intermediate, sector_num, nb_sectors,

                                &pnum_inter);

        if (ret < 0) {

            return ret;

block/backup.c

+2 −2
Original line number Diff line number Diff line
@@ -289,14 +289,14 @@ static void coroutine_fn backup_run(void *opaque) 
                 * backing file. */



                for (i = 0; i < BACKUP_SECTORS_PER_CLUSTER;) {

                    /* bdrv_co_is_allocated() only returns true/false based

                    /* bdrv_is_allocated() only returns true/false based

                     * on the first set of sectors it comes across that

                     * are are all in the same state.

                     * For that reason we must verify each sector in the

                     * backup cluster length.  We end up copying more than

                     * needed but at some point that is always the case. */

                    alloced =

                        bdrv_co_is_allocated(bs,

                        bdrv_is_allocated(bs,

                                start * BACKUP_SECTORS_PER_CLUSTER + i,

                                BACKUP_SECTORS_PER_CLUSTER - i, &n);

                    i += n;

block/raw_bsd.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int coroutine_fn raw_co_is_allocated(BlockDriverState *bs, 
                                            int64_t sector_num, int nb_sectors,

                                            int *pnum)

{

    return bdrv_co_is_allocated(bs->file, sector_num, nb_sectors, pnum);

    return bdrv_is_allocated(bs->file, sector_num, nb_sectors, pnum);

}



static int coroutine_fn raw_co_write_zeroes(BlockDriverState *bs,

block/stream.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ wait: 
            break;

        }



        ret = bdrv_co_is_allocated(bs, sector_num,

        ret = bdrv_is_allocated(bs, sector_num,

                                STREAM_BUFFER_SIZE / BDRV_SECTOR_SIZE, &n);

        if (ret == 1) {

            /* Allocated in the top, no need to copy.  */

include/block/block.h

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +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(BlockDriverState *bs, int64_t sector_num,

    int nb_sectors, int *pnum);

int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,

                                            BlockDriverState *base,

                                            int64_t sector_num,