From patchwork Sun Apr 24 17:38:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 92671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D44E5B6F75 for ; Mon, 25 Apr 2011 03:39:23 +1000 (EST) Received: from localhost ([::1]:56194 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QE3HE-0006uc-37 for incoming@patchwork.ozlabs.org; Sun, 24 Apr 2011 13:39:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QE3H8-0006uX-EC for qemu-devel@nongnu.org; Sun, 24 Apr 2011 13:39:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QE3H7-0005TQ-1G for qemu-devel@nongnu.org; Sun, 24 Apr 2011 13:39:14 -0400 Received: from mtagate6.uk.ibm.com ([194.196.100.166]:47267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QE3H6-0005T2-QU for qemu-devel@nongnu.org; Sun, 24 Apr 2011 13:39:12 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate6.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p3OHd9W9021727 for ; Sun, 24 Apr 2011 17:39:09 GMT Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3OHe2AB1900612 for ; Sun, 24 Apr 2011 18:40:11 +0100 Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3OHd1ID007225 for ; Sun, 24 Apr 2011 11:39:01 -0600 Received: from stefanha-thinkpad.ibm.com (sig-9-146-145-179.uk.ibm.com [9.146.145.179]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p3OHd1M7007222; Sun, 24 Apr 2011 11:39:01 -0600 From: Stefan Hajnoczi To: Date: Sun, 24 Apr 2011 18:38:58 +0100 Message-Id: <1303666738-26558-1-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.166 Cc: Kevin Wolf , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] qed: Fix consistency check on 32-bit hosts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Signed-off-by: Stefan Hajnoczi --- 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);