mirror of https://github.com/proxmox/mirror_qemu
Fix compressed qcow2 (Gleb Natapov)
Correctly calculate number of contiguous clusters. Acked-by: Kevin Wolf <kwolf@suse.de> Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6212 c046a42c-6fe2-441c-8c8c-71466251a162master
parent
181a29c5b2
commit
ab5ccbd65d
|
@ -620,6 +620,9 @@ static int count_contiguous_clusters(uint64_t nb_clusters, int cluster_size,
|
||||||
int i;
|
int i;
|
||||||
uint64_t offset = be64_to_cpu(l2_table[0]) & ~mask;
|
uint64_t offset = be64_to_cpu(l2_table[0]) & ~mask;
|
||||||
|
|
||||||
|
if (!offset)
|
||||||
|
return 0;
|
||||||
|
|
||||||
for (i = 0; i < nb_clusters; i++)
|
for (i = 0; i < nb_clusters; i++)
|
||||||
if (offset + i * cluster_size != (be64_to_cpu(l2_table[i]) & ~mask))
|
if (offset + i * cluster_size != (be64_to_cpu(l2_table[i]) & ~mask))
|
||||||
break;
|
break;
|
||||||
|
@ -981,6 +984,12 @@ static uint64_t alloc_cluster_offset(BlockDriverState *bs,
|
||||||
/* how many available clusters ? */
|
/* how many available clusters ? */
|
||||||
|
|
||||||
while (i < nb_clusters) {
|
while (i < nb_clusters) {
|
||||||
|
i += count_contiguous_clusters(nb_clusters - i, s->cluster_size,
|
||||||
|
&l2_table[l2_index + i], 0);
|
||||||
|
|
||||||
|
if(be64_to_cpu(l2_table[l2_index + i]))
|
||||||
|
break;
|
||||||
|
|
||||||
i += count_contiguous_free_clusters(nb_clusters - i,
|
i += count_contiguous_free_clusters(nb_clusters - i,
|
||||||
&l2_table[l2_index + i]);
|
&l2_table[l2_index + i]);
|
||||||
|
|
||||||
|
@ -989,12 +998,6 @@ static uint64_t alloc_cluster_offset(BlockDriverState *bs,
|
||||||
if ((cluster_offset & QCOW_OFLAG_COPIED) ||
|
if ((cluster_offset & QCOW_OFLAG_COPIED) ||
|
||||||
(cluster_offset & QCOW_OFLAG_COMPRESSED))
|
(cluster_offset & QCOW_OFLAG_COMPRESSED))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
i += count_contiguous_clusters(nb_clusters - i, s->cluster_size,
|
|
||||||
&l2_table[l2_index + i], 0);
|
|
||||||
|
|
||||||
if(be64_to_cpu(l2_table[l2_index + i]))
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
nb_clusters = i;
|
nb_clusters = i;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue