[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH][RESEND] Fix compressed qcow2.
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCH][RESEND] Fix compressed qcow2. |
Date: |
Tue, 6 Jan 2009 17:59:13 +0200 |
Correctly calculate number of contiguous clusters.
Signed-off-by: Gleb Natapov <address@hidden>
Acked-by: Kevin Wolf <address@hidden>
diff --git a/block-qcow2.c b/block-qcow2.c
index b3b5f8f..d8ac647 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -620,6 +620,9 @@ static int count_contiguous_clusters(uint64_t nb_clusters,
int cluster_size,
int i;
uint64_t offset = be64_to_cpu(l2_table[0]) & ~mask;
+ if (!offset)
+ return 0;
+
for (i = 0; i < nb_clusters; i++)
if (offset + i * cluster_size != (be64_to_cpu(l2_table[i]) & ~mask))
break;
@@ -981,6 +984,12 @@ static uint64_t alloc_cluster_offset(BlockDriverState *bs,
/* how many available 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,
&l2_table[l2_index + i]);
@@ -989,12 +998,6 @@ static uint64_t alloc_cluster_offset(BlockDriverState *bs,
if ((cluster_offset & QCOW_OFLAG_COPIED) ||
(cluster_offset & QCOW_OFLAG_COMPRESSED))
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;
--
Gleb.
- [Qemu-devel] [PATCH][RESEND] Fix compressed qcow2.,
Gleb Natapov <=