qcow2: Use offset_into_cluster()
PATCH 1/1 qcow2: Use offset_into_cluster()
There's a couple of places left in the qcow2 code that still do the calculation manually, so let's replace them.
Signed-off-by Alberto Garcia <[email protected]>
--- block/qcow2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
block/qcow2.c +3 -5
@@ -367,7 +367,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,return -EINVAL ; } -if (bitmaps_ext.bitmap_directory_offset & (s->cluster_size -1 )) { +if (offset_into_cluster (s, bitmaps_ext.bitmap_directory_offset)) {error_setg (errp,"bitmaps_ext: " "invalid bitmap directory offset" );return -EINVAL ;
@@ -1958,9 +1958,8 @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs, {BDRVQcow2State *s = bs->opaque;uint64_t cluster_offset; -int index_in_cluster, ret;unsigned int bytes; -int status =0 ; +int ret, status =0 ;qemu_co_mutex_lock (&s->lock);
@@ -1981,8 +1980,7 @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,if ((ret ==QCOW2_CLUSTER_NORMAL || ret ==QCOW2_CLUSTER_ZERO_ALLOC ) && !s->crypto) { - index_in_cluster = offset & (s->cluster_size -1 ); - *map = cluster_offset | index_in_cluster; + *map = cluster_offset |offset_into_cluster (s, offset); *file = s->data_file->bs; status |=BDRV_BLOCK_OFFSET_VALID ; }
Signature · 1 line
2.20.1
Quoted 8 lines · Alberto Garcia
There's a couple of places left in the qcow2 code that still do the calculation manually, so let's replace them.
Signed-off-by Alberto Garcia <[email protected]>--- block/qcow2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
Reviewed-by Eric Blake <[email protected]>
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Kevin Wolf
AppliedAm 12.12.2019 um 11:01 hat Alberto Garcia geschrieben:
Quoted 4 lines
There's a couple of places left in the qcow2 code that still do the calculation manually, so let's replace them.
Signed-off-by Alberto Garcia <[email protected]>
Thanks, applied to the block branch.
Kevin