Commit fba3998d authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

vvfat: Switch to .bdrv_co_block_status() 



We are gradually moving away from sector-based interfaces, towards
byte-based.  Update the vvfat driver accordingly.  Note that we
can rely on the block driver having already clamped limits to our
block size, and simplify accordingly.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2f83673b

block/vvfat.c

+7 −9
Original line number Diff line number Diff line
@@ -3088,15 +3088,13 @@ vvfat_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes, 
    return ret;

}



static int64_t coroutine_fn vvfat_co_get_block_status(BlockDriverState *bs,

        int64_t sector_num, int nb_sectors, int *n, BlockDriverState **file)

static int coroutine_fn vvfat_co_block_status(BlockDriverState *bs,

                                              bool want_zero, int64_t offset,

                                              int64_t bytes, int64_t *n,

                                              int64_t *map,

                                              BlockDriverState **file)

{

    *n = bs->total_sectors - sector_num;

    if (*n > nb_sectors) {

        *n = nb_sectors;

    } else if (*n < 0) {

        return 0;

    }

    *n = bytes;

    return BDRV_BLOCK_DATA;

}
@@ -3257,7 +3255,7 @@ static BlockDriver bdrv_vvfat = { 


    .bdrv_co_preadv         = vvfat_co_preadv,

    .bdrv_co_pwritev        = vvfat_co_pwritev,

    .bdrv_co_get_block_status = vvfat_co_get_block_status,

    .bdrv_co_block_status   = vvfat_co_block_status,

};



static void bdrv_vvfat_init(void)