[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] block-backend: make blk_co_preadv() 64bit
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 02/12] block-backend: make blk_co_preadv() 64bit |
Date: |
Wed, 6 Oct 2021 15:17:08 +0200 |
For both updated functions type of bytes becomes wider, so all callers
should be OK with it.
blk_co_preadv() only pass its arguments to blk_do_preadv().
blk_do_preadv() pass bytes to:
- trace_blk_co_preadv, which is updated too
- blk_check_byte_request, throttle_group_co_io_limits_intercept,
bdrv_co_preadv, which are already int64_t.
Note that requests exceeding INT_MAX are still restricted by
blk_check_byte_request().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
include/sysemu/block-backend.h | 2 +-
block/block-backend.c | 4 ++--
block/trace-events | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 29d4fdbf63..32a88878bb 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -126,7 +126,7 @@ BlockBackend *blk_by_dev(void *dev);
BlockBackend *blk_by_qdev_id(const char *id, Error **errp);
void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque);
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
- unsigned int bytes, QEMUIOVector *qiov,
+ int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags);
int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,
unsigned int bytes,
diff --git a/block/block-backend.c b/block/block-backend.c
index d121ca3868..be5a7fb5fb 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1205,7 +1205,7 @@ static void coroutine_fn
blk_wait_while_drained(BlockBackend *blk)
/* To be called between exactly one pair of blk_inc/dec_in_flight() */
static int coroutine_fn
-blk_do_preadv(BlockBackend *blk, int64_t offset, unsigned int bytes,
+blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes,
QEMUIOVector *qiov, BdrvRequestFlags flags)
{
int ret;
@@ -1236,7 +1236,7 @@ blk_do_preadv(BlockBackend *blk, int64_t offset, unsigned
int bytes,
}
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
- unsigned int bytes, QEMUIOVector *qiov,
+ int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags)
{
int ret;
diff --git a/block/trace-events b/block/trace-events
index f2d0a9b62a..ff397ffff4 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -5,7 +5,7 @@ bdrv_open_common(void *bs, const char *filename, int flags,
const char *format_n
bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d"
# block-backend.c
-blk_co_preadv(void *blk, void *bs, int64_t offset, unsigned int bytes, int
flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x"
+blk_co_preadv(void *blk, void *bs, int64_t offset, int64_t bytes, int flags)
"blk %p bs %p offset %"PRId64" bytes %" PRId64 " flags 0x%x"
blk_co_pwritev(void *blk, void *bs, int64_t offset, unsigned int bytes, int
flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x"
blk_root_attach(void *child, void *blk, void *bs) "child %p blk %p bs %p"
blk_root_detach(void *child, void *blk, void *bs) "child %p blk %p bs %p"
--
2.31.1
- [PATCH 05/12] block-backend: rename _do_ helper functions to _co_do_, (continued)
- [PATCH 05/12] block-backend: rename _do_ helper functions to _co_do_, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 04/12] block-backend: convert blk_co_pdiscard to int64_t bytes, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 12/12] block-backend: drop INT_MAX restriction from blk_check_byte_request(), Vladimir Sementsov-Ogievskiy, 2021/10/06
- [PATCH 06/12] block-coroutine-wrapper.py: support BlockBackend first argument, Vladimir Sementsov-Ogievskiy, 2021/10/06
- [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 <=
- [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, 2021/10/07