diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-04-24 18:38:58 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-04-27 16:21:00 +0200 |
| commit | 19dfc44a94f759848a0f7de7378b2f8b9af6b5d0 (patch) | |
| tree | 35d5bdf0ba785bb6dd31bdd01992da7dea6411d2 /block/qed.h | |
| parent | 7a2c4b82340d621bff462672b29c88d2020d68c1 (diff) | |
| download | qemu-19dfc44a94f759848a0f7de7378b2f8b9af6b5d0.tar.gz | |
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>
Diffstat (limited to 'block/qed.h')
| -rw-r--r-- | block/qed.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qed.h b/block/qed.h index 3e1ab84781..1d1421fee1 100644 --- a/block/qed.h +++ b/block/qed.h @@ -252,7 +252,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); |