[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/35] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv
From: |
Hanna Reitz |
Subject: |
[PULL 06/35] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() an int64_t |
Date: |
Tue, 12 Jul 2022 20:05:48 +0200 |
From: Alberto Faria <afaria@redhat.com>
For consistency with other I/O functions, and in preparation to
implement bdrv_{pread,pwrite}() using generated_co_wrapper.
unsigned int fits in int64_t, so all callers remain correct.
bdrv_check_request32() is called further down the stack and causes -EIO
to be returned if 'bytes' is negative or greater than
BDRV_REQUEST_MAX_BYTES, which in turns never exceeds SIZE_MAX.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Message-Id: <20220609152744.3891847-7-afaria@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/coroutines.h | 4 ++--
include/block/block_int-io.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/coroutines.h b/block/coroutines.h
index 830ecaa733..3f41238b33 100644
--- a/block/coroutines.h
+++ b/block/coroutines.h
@@ -91,11 +91,11 @@ int coroutine_fn blk_co_do_flush(BlockBackend *blk);
*/
int generated_co_wrapper
-bdrv_preadv(BdrvChild *child, int64_t offset, unsigned int bytes,
+bdrv_preadv(BdrvChild *child, int64_t offset, int64_t bytes,
QEMUIOVector *qiov, BdrvRequestFlags flags);
int generated_co_wrapper
-bdrv_pwritev(BdrvChild *child, int64_t offset, unsigned int bytes,
+bdrv_pwritev(BdrvChild *child, int64_t offset, int64_t bytes,
QEMUIOVector *qiov, BdrvRequestFlags flags);
int generated_co_wrapper
diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
index 5474293c4f..91cdd61692 100644
--- a/include/block/block_int-io.h
+++ b/include/block/block_int-io.h
@@ -56,7 +56,7 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags);
static inline int coroutine_fn bdrv_co_pread(BdrvChild *child,
- int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
+ int64_t offset, int64_t bytes, void *buf, BdrvRequestFlags flags)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
IO_CODE();
@@ -65,7 +65,7 @@ static inline int coroutine_fn bdrv_co_pread(BdrvChild *child,
}
static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child,
- int64_t offset, unsigned int bytes, const void *buf, BdrvRequestFlags
flags)
+ int64_t offset, int64_t bytes, const void *buf, BdrvRequestFlags flags)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
IO_CODE();
--
2.35.3
- [PULL 00/35] Block patches, Hanna Reitz, 2022/07/12
- [PULL 02/35] block: Change bdrv_{pread, pwrite, pwrite_sync}() param order, Hanna Reitz, 2022/07/12
- [PULL 01/35] block: Add a 'flags' param to bdrv_{pread, pwrite, pwrite_sync}(), Hanna Reitz, 2022/07/12
- [PULL 04/35] crypto: Make block callbacks return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 03/35] block: Make bdrv_{pread,pwrite}() return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 06/35] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() an int64_t,
Hanna Reitz <=
- [PULL 07/35] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 05/35] block: Make bdrv_co_pwrite() take a const buffer, Hanna Reitz, 2022/07/12
- [PULL 09/35] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn, Hanna Reitz, 2022/07/12
- [PULL 08/35] block: Add bdrv_co_pwrite_sync(), Hanna Reitz, 2022/07/12
- [PULL 10/35] block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty(), Hanna Reitz, 2022/07/12
- [PULL 12/35] tests/qemu-iotests: skip 108 when FUSE is not loaded, Hanna Reitz, 2022/07/12
- [PULL 16/35] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t, Hanna Reitz, 2022/07/12
- [PULL 13/35] block: Make blk_{pread,pwrite}() return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 11/35] tests/qemu-iotests: hotfix for 307, 223 output, Hanna Reitz, 2022/07/12
- [PULL 24/35] block: Implement blk_pwrite_zeroes() using generated_co_wrapper, Hanna Reitz, 2022/07/12