diff options
| author | Fam Zheng | 2015-06-04 08:02:56 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2015-06-12 15:54:01 +0200 |
| commit | 61f0ed1d54601b91b8195c1a30d7046f83283b40 (patch) | |
| tree | 9fcccc20a9928bc8c6c3d6886abd4e837ab7b437 /block | |
| parent | qcow2: Add DEFAULT_L2_CACHE_CLUSTERS (diff) | |
| download | qemu-61f0ed1d54601b91b8195c1a30d7046f83283b40.tar.gz qemu-61f0ed1d54601b91b8195c1a30d7046f83283b40.tar.xz qemu-61f0ed1d54601b91b8195c1a30d7046f83283b40.zip | |
vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status
It has the similar issue with b1649fae49a8. Since the calculation
is repeated for a few times already, introduce a function so it can be
reused.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vmdk.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index b66745dfdd..3e4d84b9e0 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1248,6 +1248,17 @@ static VmdkExtent *find_extent(BDRVVmdkState *s, return NULL; } +static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent, + int64_t sector_num) +{ + uint64_t index_in_cluster, extent_begin_sector, extent_relative_sector_num; + + extent_begin_sector = extent->end_sector - extent->sectors; + extent_relative_sector_num = sector_num - extent_begin_sector; + index_in_cluster = extent_relative_sector_num % extent->cluster_sectors; + return index_in_cluster; +} + static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum) { @@ -1285,7 +1296,7 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, break; } - index_in_cluster = sector_num % extent->cluster_sectors; + index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num); n = extent->cluster_sectors - index_in_cluster; if (n > nb_sectors) { n = nb_sectors; |