Commit 19dfc44a authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

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: default avatarMichael Tokarev <mjt@tls.msk.ru>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 7a2c4b82

block/qed-check.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {

block/qed.h

+1 −1
Original line number Diff line number Diff line
@@ -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);