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

block: Switch passthrough drivers to .bdrv_co_block_status() 



We are gradually moving away from sector-based interfaces, towards
byte-based.  Update the generic helpers, and all passthrough clients
(blkdebug, commit, mirror, throttle) 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 e3efee82

block/blkdebug.c

+11 −9
Original line number Diff line number Diff line
@@ -627,15 +627,17 @@ static int coroutine_fn blkdebug_co_pdiscard(BlockDriverState *bs, 
    return bdrv_co_pdiscard(bs->file->bs, offset, bytes);

}



static int64_t coroutine_fn blkdebug_co_get_block_status(

    BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum,

static int coroutine_fn blkdebug_co_block_status(BlockDriverState *bs,

                                                 bool want_zero,

                                                 int64_t offset,

                                                 int64_t bytes,

                                                 int64_t *pnum,

                                                 int64_t *map,

                                                 BlockDriverState **file)

{

    assert(QEMU_IS_ALIGNED(sector_num | nb_sectors,

                           DIV_ROUND_UP(bs->bl.request_alignment,

                                        BDRV_SECTOR_SIZE)));

    return bdrv_co_get_block_status_from_file(bs, sector_num, nb_sectors,

                                              pnum, file);

    assert(QEMU_IS_ALIGNED(offset | bytes, bs->bl.request_alignment));

    return bdrv_co_block_status_from_file(bs, want_zero, offset, bytes,

                                          pnum, map, file);

}



static void blkdebug_close(BlockDriverState *bs)
@@ -907,7 +909,7 @@ static BlockDriver bdrv_blkdebug = { 
    .bdrv_co_flush_to_disk  = blkdebug_co_flush,

    .bdrv_co_pwrite_zeroes  = blkdebug_co_pwrite_zeroes,

    .bdrv_co_pdiscard       = blkdebug_co_pdiscard,

    .bdrv_co_get_block_status = blkdebug_co_get_block_status,

    .bdrv_co_block_status   = blkdebug_co_block_status,



    .bdrv_debug_event           = blkdebug_debug_event,

    .bdrv_debug_breakpoint      = blkdebug_debug_breakpoint,

block/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void bdrv_commit_top_child_perm(BlockDriverState *bs, BdrvChild *c, 
static BlockDriver bdrv_commit_top = {

    .format_name                = "commit_top",

    .bdrv_co_preadv             = bdrv_commit_top_preadv,

    .bdrv_co_get_block_status   = bdrv_co_get_block_status_from_backing,

    .bdrv_co_block_status       = bdrv_co_block_status_from_backing,

    .bdrv_refresh_filename      = bdrv_commit_top_refresh_filename,

    .bdrv_close                 = bdrv_commit_top_close,

    .bdrv_child_perm            = bdrv_commit_top_child_perm,

block/io.c

+20 −16
Original line number Diff line number Diff line
@@ -1868,30 +1868,34 @@ typedef struct BdrvCoBlockStatusData { 
    bool done;

} BdrvCoBlockStatusData;



int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *bs,

                                                        int64_t sector_num,

                                                        int nb_sectors,

                                                        int *pnum,

int coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs,

                                                bool want_zero,

                                                int64_t offset,

                                                int64_t bytes,

                                                int64_t *pnum,

                                                int64_t *map,

                                                BlockDriverState **file)

{

    assert(bs->file && bs->file->bs);

    *pnum = nb_sectors;

    *pnum = bytes;

    *map = offset;

    *file = bs->file->bs;

    return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |

           (sector_num << BDRV_SECTOR_BITS);

    return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID;

}



int64_t coroutine_fn bdrv_co_get_block_status_from_backing(BlockDriverState *bs,

                                                           int64_t sector_num,

                                                           int nb_sectors,

                                                           int *pnum,

int coroutine_fn bdrv_co_block_status_from_backing(BlockDriverState *bs,

                                                   bool want_zero,

                                                   int64_t offset,

                                                   int64_t bytes,

                                                   int64_t *pnum,

                                                   int64_t *map,

                                                   BlockDriverState **file)

{

    assert(bs->backing && bs->backing->bs);

    *pnum = nb_sectors;

    *pnum = bytes;

    *map = offset;

    *file = bs->backing->bs;

    return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |

           (sector_num << BDRV_SECTOR_BITS);

    return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID;

}



/*

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ static BlockDriver bdrv_mirror_top = { 
    .bdrv_co_pwrite_zeroes      = bdrv_mirror_top_pwrite_zeroes,

    .bdrv_co_pdiscard           = bdrv_mirror_top_pdiscard,

    .bdrv_co_flush              = bdrv_mirror_top_flush,

    .bdrv_co_get_block_status   = bdrv_co_get_block_status_from_backing,

    .bdrv_co_block_status       = bdrv_co_block_status_from_backing,

    .bdrv_refresh_filename      = bdrv_mirror_top_refresh_filename,

    .bdrv_close                 = bdrv_mirror_top_close,

    .bdrv_child_perm            = bdrv_mirror_top_child_perm,

block/throttle.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static BlockDriver bdrv_throttle = { 
    .bdrv_reopen_prepare                =   throttle_reopen_prepare,

    .bdrv_reopen_commit                 =   throttle_reopen_commit,

    .bdrv_reopen_abort                  =   throttle_reopen_abort,

    .bdrv_co_get_block_status           =   bdrv_co_get_block_status_from_file,

    .bdrv_co_block_status               =   bdrv_co_block_status_from_file,



    .bdrv_co_drain_begin                =   throttle_co_drain_begin,

    .bdrv_co_drain_end                  =   throttle_co_drain_end,