summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-04-24 18:38:58 +0100
committerJustin M. Forbes <jforbes@redhat.com>2011-05-03 08:31:32 -0500
commit9b33410d3bdd40b6a289c6b79d40a96b129e22af (patch)
tree8f84af4691aa001436a1228551ae263ee9301b4a
parentexit if -drive specified is invalid instead of ignoring the "wrong" -drive (diff)
downloadqemu-kvm-9b33410d3bdd40b6a289c6b79d40a96b129e22af.tar.gz
qemu-kvm-9b33410d3bdd40b6a289c6b79d40a96b129e22af.tar.bz2
qemu-kvm-9b33410d3bdd40b6a289c6b79d40a96b129e22af.zip
qed: Fix consistency check on 32-bit hosts
The qed_bytes_to_clusters() function is normally used with size_t lengths. Consistency check used it with file size length and therefore failed on 32-bit hosts when the image file is 4 GB or more. Make qed_bytes_to_clusters() explicitly 64-bit and update consistency check to keep 64-bit cluster counts. Reported-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/qed-check.c4
-rw-r--r--block/qed.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/block/qed-check.c b/block/qed-check.c
index 4600932bf..474c847d1 100644
--- a/block/qed-check.c
+++ b/block/qed-check.c
@@ -18,7 +18,7 @@ typedef struct {
BdrvCheckResult *result;
bool fix; /* whether to fix invalid offsets */
- size_t nclusters;
+ uint64_t nclusters;
uint32_t *used_clusters; /* referenced cluster bitmap */
QEDRequest request;
@@ -176,7 +176,7 @@ static int qed_check_l1_table(QEDCheck *check, QEDTable *table)
static void qed_check_for_leaks(QEDCheck *check)
{
BDRVQEDState *s = check->s;
- size_t i;
+ uint64_t i;
for (i = s->header.header_size; i < check->nclusters; i++) {
if (!qed_test_bit(check->used_clusters, i)) {
diff --git a/block/qed.h b/block/qed.h
index 2925e37b1..9f72ad549 100644
--- a/block/qed.h
+++ b/block/qed.h
@@ -251,7 +251,7 @@ static inline uint64_t qed_offset_into_cluster(BDRVQEDState *s, uint64_t offset)
return offset & (s->header.cluster_size - 1);
}
-static inline unsigned int qed_bytes_to_clusters(BDRVQEDState *s, size_t bytes)
+static inline uint64_t qed_bytes_to_clusters(BDRVQEDState *s, uint64_t bytes)
{
return qed_start_of_cluster(s, bytes + (s->header.cluster_size - 1)) /
(s->header.cluster_size - 1);