We are gradually moving away from sector-based interfaces, towards byte-based. Update the qed driver accordingly. There is no intent to optimize based on the mapping flag for this format.
Signed-off-by: Eric Blake <ebl...@redhat.com> --- v2: rebase to mapping flag, fix mask in qed_is_allocated_cb --- block/qed.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/block/qed.c b/block/qed.c index 86cad21..a80195c 100644 --- a/block/qed.c +++ b/block/qed.c @@ -677,7 +677,7 @@ typedef struct { Coroutine *co; uint64_t pos; int64_t status; - int *pnum; + int64_t *pnum; BlockDriverState **file; } QEDIsAllocatedCB; @@ -685,10 +685,10 @@ static void qed_is_allocated_cb(void *opaque, int ret, uint64_t offset, size_t l { QEDIsAllocatedCB *cb = opaque; BDRVQEDState *s = cb->bs->opaque; - *cb->pnum = len / BDRV_SECTOR_SIZE; + *cb->pnum = len; switch (ret) { case QED_CLUSTER_FOUND: - offset |= qed_offset_into_cluster(s, cb->pos); + offset |= qed_offset_into_cluster(s, cb->pos) & BDRV_BLOCK_OFFSET_MASK; cb->status = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset; *cb->file = cb->bs->file->bs; break; @@ -710,16 +710,18 @@ static void qed_is_allocated_cb(void *opaque, int ret, uint64_t offset, size_t l } } -static int64_t coroutine_fn bdrv_qed_co_get_block_status(BlockDriverState *bs, - int64_t sector_num, - int nb_sectors, int *pnum, - BlockDriverState **file) +static int64_t coroutine_fn bdrv_qed_co_block_status(BlockDriverState *bs, + bool mapping, + int64_t pos, + int64_t bytes, + int64_t *pnum, + BlockDriverState **file) { BDRVQEDState *s = bs->opaque; - size_t len = (size_t)nb_sectors * BDRV_SECTOR_SIZE; + size_t len; QEDIsAllocatedCB cb = { .bs = bs, - .pos = (uint64_t)sector_num * BDRV_SECTOR_SIZE, + .pos = pos, .status = BDRV_BLOCK_OFFSET_MASK, .pnum = pnum, .file = file, @@ -1541,7 +1543,7 @@ static BlockDriver bdrv_qed = { .bdrv_child_perm = bdrv_format_default_perms, .bdrv_create = bdrv_qed_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, - .bdrv_co_get_block_status = bdrv_qed_co_get_block_status, + .bdrv_co_block_status = bdrv_qed_co_block_status, .bdrv_co_readv = bdrv_qed_co_readv, .bdrv_co_writev = bdrv_qed_co_writev, .bdrv_co_pwrite_zeroes = bdrv_qed_co_pwrite_zeroes, -- 2.9.4