[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/12] block-backend: update blk_co_pwrite() and blk_co_pread() w
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 14/12] block-backend: update blk_co_pwrite() and blk_co_pread() wrappers |
Date: |
Thu, 7 Oct 2021 19:52:43 +0200 |
Make bytes argument int64_t to be consistent with modern block-layer.
Callers should be OK with it as type becomes wider.
What is inside functions?
- Conversion from int64_t to size_t. Still, we
can't have a buffer larger than SIZE_MAX, therefore bytes should not be
larger than SIZE_MAX as well. Add and assertion.
- Passing to blk_co_pwritev() / blk_co_preadv() which already has
int64_t bytes argument.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
include/sysemu/block-backend.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index f3227098fc..53c9b3271b 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -137,20 +137,24 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk,
int64_t offset,
BdrvRequestFlags flags);
static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
- unsigned int bytes, void *buf,
+ int64_t bytes, void *buf,
BdrvRequestFlags flags)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+ assert(bytes <= SIZE_MAX);
+
return blk_co_preadv(blk, offset, bytes, &qiov, flags);
}
static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,
- unsigned int bytes, void *buf,
+ int64_t bytes, void *buf,
BdrvRequestFlags flags)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+ assert(bytes <= SIZE_MAX);
+
return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
}
--
2.31.1
- [PATCH 08/12] block-backend: convert blk_foo wrappers to use int64_t bytes parameter, (continued)
- [PATCH 08/12] block-backend: convert blk_foo wrappers to use int64_t bytes parameter, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 02/12] block-backend: make blk_co_preadv() 64bit, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 07/12] block-backend: drop blk_prw, use block-coroutine-wrapper, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 09/12] block-backend: convert blk_co_copy_range to int64_t bytes, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 13/12] block-backend: fix blk_co_flush prototype to mention coroutine_fn, Vladimir Sementsov-Ogievskiy, 2021/10/07
- [PATCH 14/12] block-backend: update blk_co_pwrite() and blk_co_pread() wrappers,
Vladimir Sementsov-Ogievskiy <=