From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Subject: [PULL 15/15] block-backend: update blk_co_pwrite() and blk_co_pread() wrappers
Date: Fri, 15 Oct 2021 16:10:10 -0500 [thread overview]
Message-ID: <20211015211011.1272011-16-eblake@redhat.com> (raw)
In-Reply-To: <20211015211011.1272011-1-eblake@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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 an 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>
Message-Id: <20211007175243.642516-2-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: spelling fix]
Signed-off-by: Eric Blake <eblake@redhat.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 3fbc74e17cb4..e5e1524f065b 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
next prev parent reply other threads:[~2021-10-15 21:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 21:09 [PULL 00/15] NBD patches through 2021-10-15 Eric Blake
2021-10-15 21:09 ` [PULL 01/15] qcow2: Silence clang -m32 compiler warning Eric Blake
2021-10-15 21:09 ` [PULL 02/15] block-backend: blk_check_byte_request(): int64_t bytes Eric Blake
2021-10-15 21:09 ` [PULL 03/15] block-backend: make blk_co_preadv() 64bit Eric Blake
2021-10-15 21:09 ` [PULL 04/15] block-backend: convert blk_co_pwritev_part to int64_t bytes Eric Blake
2021-10-15 21:10 ` [PULL 05/15] block-backend: convert blk_co_pdiscard " Eric Blake
2021-10-15 21:10 ` [PULL 06/15] block-backend: rename _do_ helper functions to _co_do_ Eric Blake
2021-10-15 21:10 ` [PULL 07/15] block-coroutine-wrapper.py: support BlockBackend first argument Eric Blake
2021-10-15 21:10 ` [PULL 08/15] block-backend: drop blk_prw, use block-coroutine-wrapper Eric Blake
2021-10-15 21:10 ` [PULL 09/15] block-backend: convert blk_foo wrappers to use int64_t bytes parameter Eric Blake
2021-10-15 21:10 ` [PULL 10/15] block-backend: convert blk_co_copy_range to int64_t bytes Eric Blake
2021-10-15 21:10 ` [PULL 11/15] block-backend: convert blk_aio_ functions to int64_t bytes paramter Eric Blake
2021-10-15 21:10 ` [PULL 12/15] block-backend: blk_pread, blk_pwrite: rename count parameter to bytes Eric Blake
2021-10-15 21:10 ` [PULL 13/15] block-backend: drop INT_MAX restriction from blk_check_byte_request() Eric Blake
2021-10-15 21:10 ` [PULL 14/15] block-backend: fix blk_co_flush prototype to mention coroutine_fn Eric Blake
2021-10-15 21:10 ` Eric Blake [this message]
2021-10-15 22:49 ` [PULL 00/15] NBD patches through 2021-10-15 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211015211011.1272011-16-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).