summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2013-09-27 12:14:16 +0200
committerKevin Wolf <kwolf@redhat.com>2013-09-27 17:22:43 +0200
commit22f0dd29afd6011b2b7a94bf860502eafce4ddd5 (patch)
tree2d8d0edfce9380395c79871eef22e09331640d68 /block
parent15684a474286cc2c6106c756ddd095a21d058970 (diff)
downloadqemu-22f0dd29afd6011b2b7a94bf860502eafce4ddd5.tar.gz
qemu-22f0dd29afd6011b2b7a94bf860502eafce4ddd5.tar.bz2
qemu-22f0dd29afd6011b2b7a94bf860502eafce4ddd5.zip
qcow2: COMPRESSED on count_contiguous_clusters
Compressed clusters can never be contiguous, therefore the corresponding flag does not need to be given explicitly to count_contiguous_clusters. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/qcow2-cluster.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 8b2361a2ed..f93960f509 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -493,8 +493,7 @@ int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
return -EIO;
}
c = count_contiguous_clusters(nb_clusters, s->cluster_size,
- &l2_table[l2_index], 0,
- QCOW_OFLAG_COMPRESSED | QCOW_OFLAG_ZERO);
+ &l2_table[l2_index], 0, QCOW_OFLAG_ZERO);
*cluster_offset = 0;
break;
case QCOW2_CLUSTER_UNALLOCATED:
@@ -505,8 +504,7 @@ int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
case QCOW2_CLUSTER_NORMAL:
/* how many allocated clusters ? */
c = count_contiguous_clusters(nb_clusters, s->cluster_size,
- &l2_table[l2_index], 0,
- QCOW_OFLAG_COMPRESSED | QCOW_OFLAG_ZERO);
+ &l2_table[l2_index], 0, QCOW_OFLAG_ZERO);
*cluster_offset &= L2E_OFFSET_MASK;
break;
default: