[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 04/10] block: Use uint64_t for BdrvTrackedRequest
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v3 04/10] block: Use uint64_t for BdrvTrackedRequest byte fields |
Date: |
Tue, 10 Jul 2018 14:31:18 +0800 |
This matches the types used for bytes in the rest parts of block layer.
In the case of bdrv_co_truncate, new_bytes can be the image size which
probably doesn't fit in a 32 bit int.
Signed-off-by: Fam Zheng <address@hidden>
---
block/io.c | 8 +++++---
include/block/block_int.h | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/io.c b/block/io.c
index 77f35b1013..c56e329bb5 100644
--- a/block/io.c
+++ b/block/io.c
@@ -587,9 +587,11 @@ static void tracked_request_end(BdrvTrackedRequest *req)
static void tracked_request_begin(BdrvTrackedRequest *req,
BlockDriverState *bs,
int64_t offset,
- unsigned int bytes,
+ uint64_t bytes,
enum BdrvTrackedRequestType type)
{
+ assert(bytes <= INT64_MAX && offset <= INT64_MAX - bytes);
+
*req = (BdrvTrackedRequest){
.bs = bs,
.offset = offset,
@@ -611,7 +613,7 @@ static void tracked_request_begin(BdrvTrackedRequest *req,
static void mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)
{
int64_t overlap_offset = req->offset & ~(align - 1);
- unsigned int overlap_bytes = ROUND_UP(req->offset + req->bytes, align)
+ uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align)
- overlap_offset;
if (!req->serialising) {
@@ -667,7 +669,7 @@ static int bdrv_get_cluster_size(BlockDriverState *bs)
}
static bool tracked_request_overlaps(BdrvTrackedRequest *req,
- int64_t offset, unsigned int bytes)
+ int64_t offset, uint64_t bytes)
{
/* aaaa bbbb */
if (offset >= req->overlap_offset + req->overlap_bytes) {
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 119b6e4ea5..90a33e4b0e 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -69,12 +69,12 @@ enum BdrvTrackedRequestType {
typedef struct BdrvTrackedRequest {
BlockDriverState *bs;
int64_t offset;
- unsigned int bytes;
+ uint64_t bytes;
enum BdrvTrackedRequestType type;
bool serialising;
int64_t overlap_offset;
- unsigned int overlap_bytes;
+ uint64_t overlap_bytes;
QLIST_ENTRY(BdrvTrackedRequest) list;
Coroutine *co; /* owner, used for deadlock detection */
--
2.17.1
- [Qemu-block] [PATCH v3 00/10] block: Fix dst reading after tail copy offloading, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 01/10] block: Prefix file driver trace points with "file_", Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 02/10] block: Add copy offloading trace points, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 03/10] block: Use BdrvChild to discard, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 04/10] block: Use uint64_t for BdrvTrackedRequest byte fields,
Fam Zheng <=
- [Qemu-block] [PATCH v3 05/10] block: Extract common write req handling, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 06/10] block: Fix handling of image enlarging write, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 07/10] block: Use common req handling for discard, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 08/10] block: Use common req handling in copy offloading, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 09/10] block: Fix bdrv_co_truncate overlap check, Fam Zheng, 2018/07/10
- [Qemu-block] [PATCH v3 10/10] block: Use common write req handling in truncate, Fam Zheng, 2018/07/10
- Re: [Qemu-block] [PATCH v3 00/10] block: Fix dst reading after tail copy offloading, Kevin Wolf, 2018/07/10