[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] qed: Fix consistency check on 32-bit hosts
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 09/11] qed: Fix consistency check on 32-bit hosts |
Date: |
Wed, 27 Apr 2011 15:43:08 +0200 |
From: Stefan Hajnoczi <address@hidden>
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qed-check.c | 4 ++--
block/qed.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/qed-check.c b/block/qed-check.c
index ea4ebc8..22cd07f 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;
@@ -177,7 +177,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 3e1ab84..1d1421f 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);
--
1.7.2.3
- [Qemu-devel] [PULL 00/11] Block patches, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 02/11] atapi: Add 'medium ready' to 'medium not ready' transition on cd change, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 01/11] qemu-img: allow rebase to a NULL backing file when unsafe, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 03/11] Improve accuracy of block migration bandwidth calculation, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 06/11] ide/atapi: Use table instead of switch for commands, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 05/11] ide/atapi: Factor commands out, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 08/11] ide/atapi: Introduce CHECK_READY flag for commands, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 04/11] ide: Split atapi.c out, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 11/11] Remove obsolete 'enabled' variable from progress state, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 07/11] ide/atapi: Replace bdrv_get_geometry calls by s->nb_sectors, Kevin Wolf, 2011/04/27
- [Qemu-devel] [PATCH 09/11] qed: Fix consistency check on 32-bit hosts,
Kevin Wolf <=
- [Qemu-devel] [PATCH 10/11] Add dd-style SIGUSR1 progress reporting, Kevin Wolf, 2011/04/27
- Re: [Qemu-devel] [PULL 00/11] Block patches, Aurelien Jarno, 2011/04/27