|
 |
9ae3a8 |
From dbcfb970e94adbf251dadb900128d576a7e0a737 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 25 Mar 2014 14:23:45 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 38/49] dmg: use uint64_t consistently for sectors and lengths
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1395753835-7591-39-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: n/a
|
|
|
9ae3a8 |
O-Subject: [virt-devel] [EMBARGOED RHEL-7.0 qemu-kvm PATCH 38/48] dmg: use uint64_t consistently for sectors and lengths
|
|
|
9ae3a8 |
Bugzilla: 1066691
|
|
|
9ae3a8 |
RH-Acked-by: Jeff Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1066691
|
|
|
9ae3a8 |
Upstream status: Series embargoed
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The DMG metadata is stored as uint64_t, so use the same type for
|
|
|
9ae3a8 |
sector_num. int was a particularly poor choice since it is only 32-bit
|
|
|
9ae3a8 |
and would truncate large values.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/dmg.c | 6 +++---
|
|
|
9ae3a8 |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/dmg.c b/block/dmg.c
|
|
|
9ae3a8 |
index ad253fe..be0ee33 100644
|
|
|
9ae3a8 |
--- a/block/dmg.c
|
|
|
9ae3a8 |
+++ b/block/dmg.c
|
|
|
9ae3a8 |
@@ -281,7 +281,7 @@ fail:
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static inline int is_sector_in_chunk(BDRVDMGState* s,
|
|
|
9ae3a8 |
- uint32_t chunk_num, int sector_num)
|
|
|
9ae3a8 |
+ uint32_t chunk_num, uint64_t sector_num)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
if (chunk_num >= s->n_chunks || s->sectors[chunk_num] > sector_num ||
|
|
|
9ae3a8 |
s->sectors[chunk_num] + s->sectorcounts[chunk_num] <= sector_num) {
|
|
|
9ae3a8 |
@@ -291,7 +291,7 @@ static inline int is_sector_in_chunk(BDRVDMGState* s,
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static inline uint32_t search_chunk(BDRVDMGState *s, int sector_num)
|
|
|
9ae3a8 |
+static inline uint32_t search_chunk(BDRVDMGState *s, uint64_t sector_num)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
/* binary search */
|
|
|
9ae3a8 |
uint32_t chunk1 = 0, chunk2 = s->n_chunks, chunk3;
|
|
|
9ae3a8 |
@@ -308,7 +308,7 @@ static inline uint32_t search_chunk(BDRVDMGState *s, int sector_num)
|
|
|
9ae3a8 |
return s->n_chunks; /* error */
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static inline int dmg_read_chunk(BlockDriverState *bs, int sector_num)
|
|
|
9ae3a8 |
+static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
BDRVDMGState *s = bs->opaque;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|