From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2NW-0002uG-QQ for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV2NP-0003QS-Vc for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2NP-0003QJ-LZ for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:21:31 -0400 From: Stefan Hajnoczi Date: Tue, 1 Apr 2014 19:19:18 +0200 Message-Id: <1396372769-11688-41-git-send-email-stefanha@redhat.com> In-Reply-To: <1396372769-11688-1-git-send-email-stefanha@redhat.com> References: <1396372769-11688-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.0 40/51] dmg: use uint64_t consistently for sectors and lengths List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Stefan Hajnoczi The DMG metadata is stored as uint64_t, so use the same type for sector_num. int was a particularly poor choice since it is only 32-bit and would truncate large values. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- block/dmg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index ad253fe..be0ee33 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -281,7 +281,7 @@ fail: } static inline int is_sector_in_chunk(BDRVDMGState* s, - uint32_t chunk_num, int sector_num) + uint32_t chunk_num, uint64_t sector_num) { if (chunk_num >= s->n_chunks || s->sectors[chunk_num] > sector_num || s->sectors[chunk_num] + s->sectorcounts[chunk_num] <= sector_num) { @@ -291,7 +291,7 @@ static inline int is_sector_in_chunk(BDRVDMGState* s, } } -static inline uint32_t search_chunk(BDRVDMGState *s, int sector_num) +static inline uint32_t search_chunk(BDRVDMGState *s, uint64_t sector_num) { /* binary search */ uint32_t chunk1 = 0, chunk2 = s->n_chunks, chunk3; @@ -308,7 +308,7 @@ static inline uint32_t search_chunk(BDRVDMGState *s, int sector_num) return s->n_chunks; /* error */ } -static inline int dmg_read_chunk(BlockDriverState *bs, int sector_num) +static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) { BDRVDMGState *s = bs->opaque; -- 1.9.0