aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2021-10-06 15:17:14 +0200
committerEric Blake <eblake@redhat.com>2021-10-15 15:53:48 -0500
commit06f0325c5b62f80bab1c9eb50edc814158d6005e (patch)
tree7b2d0bb6a09993be5877fc6357b157294a3332b1 /block
parent16d36e299669145f3021f2912aefbc32d7f0593c (diff)
downloadqemu-06f0325c5b62f80bab1c9eb50edc814158d6005e.zip
qemu-06f0325c5b62f80bab1c9eb50edc814158d6005e.tar.gz
qemu-06f0325c5b62f80bab1c9eb50edc814158d6005e.tar.bz2
block-backend: convert blk_foo wrappers to use int64_t bytes parameter
Convert blk_pdiscard, blk_pwrite_compressed, blk_pwrite_zeroes. These are just wrappers for functions with int64_t argument, so allow passing int64_t as well. Parameter type becomes wider so all callers should be OK with it. Note that requests exceeding INT_MAX are still restricted by blk_check_byte_request(). Note also that we don't (and are not going to) convert blk_pwrite and blk_pread: these functions return number of bytes on success, so to update them, we should change return type to int64_t as well, which will lead to investigating and updating all callers which is too much. So, blk_pread and blk_pwrite remain unchanged. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20211006131718.214235-9-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> [eblake: grammar tweaks] Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/block-backend.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index 2e6ccce..ee20ae5 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1330,7 +1330,7 @@ typedef struct BlkRwCo {
} BlkRwCo;
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
- int bytes, BdrvRequestFlags flags)
+ int64_t bytes, BdrvRequestFlags flags)
{
return blk_pwritev_part(blk, offset, bytes, NULL, 0,
flags | BDRV_REQ_ZERO_WRITE);
@@ -1637,7 +1637,7 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,
return ret;
}
-int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes)
+int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes)
{
int ret;
@@ -2186,10 +2186,10 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
}
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
- int count)
+ int64_t bytes)
{
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, count);
- return blk_pwritev_part(blk, offset, count, &qiov, 0,
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+ return blk_pwritev_part(blk, offset, bytes, &qiov, 0,
BDRV_REQ_WRITE_COMPRESSED);
}