falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmg: use uint64_t consistently for sectors and lengths 

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 <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 686d7148ec)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Stefan Hajnoczi 2014-03-26 13:05:59 +01:00 committed by Michael Roth
parent 758c4840c6
commit d400b5dc4a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/dmg.c
View File

@ -281,7 +281,7 @@ fail:
} }
static inline int is_sector_in_chunk(BDRVDMGState* s, 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 || if (chunk_num >= s->n_chunks || s->sectors[chunk_num] > sector_num ||
s->sectors[chunk_num] + s->sectorcounts[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 */ /* binary search */
uint32_t chunk1 = 0, chunk2 = s->n_chunks, chunk3; 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 */ 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; BDRVDMGState *s = bs->opaque;