diff options
| author | Alberto Garcia <berto@igalia.com> | 2019-12-12 12:01:21 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-12-18 11:21:16 +0100 |
| commit | 74e60fb56af3ea7ad94c2db7f38a9e226dc4faae (patch) | |
| tree | 6b46feffdb5a596c5ef8cf7627c4a2bff85da168 /block | |
| parent | 4688c4e32ec76004676470f11734478799673d6d (diff) | |
| download | qemu-74e60fb56af3ea7ad94c2db7f38a9e226dc4faae.zip qemu-74e60fb56af3ea7ad94c2db7f38a9e226dc4faae.tar.gz qemu-74e60fb56af3ea7ad94c2db7f38a9e226dc4faae.tar.bz2 | |
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 <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index de0e89c..375bbd0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -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; @@ -1959,9 +1959,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); @@ -1982,8 +1981,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; } |