| Message ID | 20171012185916.22776-18-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | add byte-based block_status driver callbacks | expand |
12.10.2017 21:59, Eric Blake wrote: > We are gradually moving away from sector-based interfaces, towards > byte-based. Update the vmdk driver accordingly. > > Signed-off-by: Eric Blake <eblake@redhat.com> > > --- > v4: rebase to interface tweak > v3: no change > v2: rebase to mapping flag > --- > block/vmdk.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index c665bcc977..624b5c296a 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -1303,25 +1303,27 @@ static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent, > return offset / BDRV_SECTOR_SIZE; > } > > -static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, > - int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file) > +static int coroutine_fn vmdk_co_block_status(BlockDriverState *bs, > + bool want_zero, > + int64_t offset, int64_t bytes, > + int64_t *pnum, int64_t *map, > + BlockDriverState **file) > { > BDRVVmdkState *s = bs->opaque; > int64_t index_in_cluster, n, ret; > - uint64_t offset; > + uint64_t cluster_offset; > VmdkExtent *extent; > > - extent = find_extent(s, sector_num, NULL); > + extent = find_extent(s, offset >> BDRV_SECTOR_BITS, NULL); > if (!extent) { > return 0; > } > qemu_co_mutex_lock(&s->lock); > - ret = get_cluster_offset(bs, extent, NULL, > - sector_num * 512, false, &offset, > + ret = get_cluster_offset(bs, extent, NULL, offset, false, &cluster_offset, > 0, 0); > qemu_co_mutex_unlock(&s->lock); > > - index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num); > + index_in_cluster = vmdk_find_offset_in_cluster(extent, offset); vmdk_find_index_in_cluster becomes unused. with it dropped: Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > switch (ret) { > case VMDK_ERROR: > ret = -EIO; > @@ -1336,18 +1338,14 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, > ret = BDRV_BLOCK_DATA; > if (!extent->compressed) { > ret |= BDRV_BLOCK_OFFSET_VALID; > - ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS)) > - & BDRV_BLOCK_OFFSET_MASK; > + *map = cluster_offset + index_in_cluster; > } > *file = extent->file->bs; > break; > } > > - n = extent->cluster_sectors - index_in_cluster; > - if (n > nb_sectors) { > - n = nb_sectors; > - } > - *pnum = n; > + n = extent->cluster_sectors * BDRV_SECTOR_SIZE - index_in_cluster; > + *pnum = MIN(n, bytes); > return ret; > } > > @@ -2393,7 +2391,7 @@ static BlockDriver bdrv_vmdk = { > .bdrv_close = vmdk_close, > .bdrv_create = vmdk_create, > .bdrv_co_flush_to_disk = vmdk_co_flush, > - .bdrv_co_get_block_status = vmdk_co_get_block_status, > + .bdrv_co_block_status = vmdk_co_block_status, > .bdrv_get_allocated_file_size = vmdk_get_allocated_file_size, > .bdrv_has_zero_init = vmdk_has_zero_init, > .bdrv_get_specific_info = vmdk_get_specific_info,
On 11/30/2017 05:39 AM, Vladimir Sementsov-Ogievskiy wrote: > 12.10.2017 21:59, Eric Blake wrote: >> We are gradually moving away from sector-based interfaces, towards >> byte-based. Update the vmdk driver accordingly. >> >> Signed-off-by: Eric Blake <eblake@redhat.com> >> >> --- >> v4: rebase to interface tweak >> v3: no change >> v2: rebase to mapping flag >> --- >> block/vmdk.c | 28 +++++++++++++--------------- >> 1 file changed, 13 insertions(+), 15 deletions(-) >> +static int coroutine_fn vmdk_co_block_status(BlockDriverState *bs, >> + bool want_zero, >> + int64_t offset, int64_t >> bytes, >> + int64_t *pnum, int64_t >> *map, >> + BlockDriverState **file) >> { >> BDRVVmdkState *s = bs->opaque; >> int64_t index_in_cluster, n, ret; >> - uint64_t offset; >> + uint64_t cluster_offset; >> VmdkExtent *extent; >> >> - extent = find_extent(s, sector_num, NULL); >> + extent = find_extent(s, offset >> BDRV_SECTOR_BITS, NULL); >> if (!extent) { >> return 0; Pre-existing bug - this returns 0, but did not set pnum.
diff --git a/block/vmdk.c b/block/vmdk.c index c665bcc977..624b5c296a 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1303,25 +1303,27 @@ static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent, return offset / BDRV_SECTOR_SIZE; } -static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file) +static int coroutine_fn vmdk_co_block_status(BlockDriverState *bs, + bool want_zero, + int64_t offset, int64_t bytes, + int64_t *pnum, int64_t *map, + BlockDriverState **file) { BDRVVmdkState *s = bs->opaque; int64_t index_in_cluster, n, ret; - uint64_t offset; + uint64_t cluster_offset; VmdkExtent *extent; - extent = find_extent(s, sector_num, NULL); + extent = find_extent(s, offset >> BDRV_SECTOR_BITS, NULL); if (!extent) { return 0; } qemu_co_mutex_lock(&s->lock); - ret = get_cluster_offset(bs, extent, NULL, - sector_num * 512, false, &offset, + ret = get_cluster_offset(bs, extent, NULL, offset, false, &cluster_offset, 0, 0); qemu_co_mutex_unlock(&s->lock); - index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num); + index_in_cluster = vmdk_find_offset_in_cluster(extent, offset); switch (ret) { case VMDK_ERROR: ret = -EIO; @@ -1336,18 +1338,14 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, ret = BDRV_BLOCK_DATA; if (!extent->compressed) { ret |= BDRV_BLOCK_OFFSET_VALID; - ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS)) - & BDRV_BLOCK_OFFSET_MASK; + *map = cluster_offset + index_in_cluster; } *file = extent->file->bs; break; } - n = extent->cluster_sectors - index_in_cluster; - if (n > nb_sectors) { - n = nb_sectors; - } - *pnum = n; + n = extent->cluster_sectors * BDRV_SECTOR_SIZE - index_in_cluster; + *pnum = MIN(n, bytes); return ret; } @@ -2393,7 +2391,7 @@ static BlockDriver bdrv_vmdk = { .bdrv_close = vmdk_close, .bdrv_create = vmdk_create, .bdrv_co_flush_to_disk = vmdk_co_flush, - .bdrv_co_get_block_status = vmdk_co_get_block_status, + .bdrv_co_block_status = vmdk_co_block_status, .bdrv_get_allocated_file_size = vmdk_get_allocated_file_size, .bdrv_has_zero_init = vmdk_has_zero_init, .bdrv_get_specific_info = vmdk_get_specific_info,
We are gradually moving away from sector-based interfaces, towards byte-based. Update the vmdk driver accordingly. Signed-off-by: Eric Blake <eblake@redhat.com> --- v4: rebase to interface tweak v3: no change v2: rebase to mapping flag --- block/vmdk.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)