From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Hanna Reitz <hreitz@redhat.com>
Subject: [PULL 29/35] block: Reorganize some declarations in block-backend-io.h
Date: Tue, 12 Jul 2022 20:06:11 +0200 [thread overview]
Message-ID: <20220712180617.1362407-30-hreitz@redhat.com> (raw)
In-Reply-To: <20220712180617.1362407-1-hreitz@redhat.com>
From: Alberto Faria <afaria@redhat.com>
Keep generated_co_wrapper and coroutine_fn pairs together. This should
make it clear that each I/O function has these two versions.
Also move blk_co_{pread,pwrite}()'s implementations out of the header
file for consistency.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220705161527.1054072-18-afaria@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
include/sysemu/block-backend-io.h | 77 +++++++++++++------------------
block/block-backend.c | 22 +++++++++
2 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h
index a79b7d9d9c..50f5aa2e07 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -104,9 +104,16 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset,
int64_t bytes, void *buf,
BdrvRequestFlags flags);
-int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,
- int64_t bytes, const void *buf,
+int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes,
+ void *buf, BdrvRequestFlags flags);
+
+int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset,
+ int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags);
+int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
+ int64_t bytes, QEMUIOVector *qiov,
+ BdrvRequestFlags flags);
+
int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset,
int64_t bytes, QEMUIOVector *qiov,
size_t qiov_offset,
@@ -114,12 +121,20 @@ int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset,
int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset,
int64_t bytes, QEMUIOVector *qiov,
size_t qiov_offset, BdrvRequestFlags flags);
-int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset,
- int64_t bytes, QEMUIOVector *qiov,
+
+int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,
+ int64_t bytes, const void *buf,
BdrvRequestFlags flags);
-int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
- int64_t bytes, QEMUIOVector *qiov,
- BdrvRequestFlags flags);
+int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
+ const void *buf, BdrvRequestFlags flags);
+
+int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset,
+ int64_t bytes, QEMUIOVector *qiov,
+ BdrvRequestFlags flags);
+int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
+ int64_t bytes, QEMUIOVector *qiov,
+ BdrvRequestFlags flags);
+
int generated_co_wrapper blk_pwritev_part(BlockBackend *blk, int64_t offset,
int64_t bytes, QEMUIOVector *qiov,
size_t qiov_offset,
@@ -128,36 +143,18 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,
int64_t bytes,
QEMUIOVector *qiov, size_t qiov_offset,
BdrvRequestFlags flags);
-int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset,
- int64_t bytes, QEMUIOVector *qiov,
- BdrvRequestFlags flags);
-int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
- int64_t bytes, QEMUIOVector *qiov,
- BdrvRequestFlags flags);
-
-static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
- int64_t bytes, void *buf,
- BdrvRequestFlags flags)
-{
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
- IO_OR_GS_CODE();
-
- 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,
- int64_t bytes, const void *buf,
- BdrvRequestFlags flags)
-{
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
- IO_OR_GS_CODE();
- assert(bytes <= SIZE_MAX);
+int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk,
+ int64_t offset, int64_t bytes,
+ const void *buf);
+int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,
+ int64_t bytes, const void *buf);
- return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
-}
+int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
+ int64_t bytes,
+ BdrvRequestFlags flags);
+int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
+ int64_t bytes, BdrvRequestFlags flags);
int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset,
int64_t bytes);
@@ -172,16 +169,6 @@ int generated_co_wrapper blk_ioctl(BlockBackend *blk, unsigned long int req,
int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req,
void *buf);
-int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk,
- int64_t offset, int64_t bytes,
- const void *buf);
-int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,
- int64_t bytes, const void *buf);
-int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
- int64_t bytes,
- BdrvRequestFlags flags);
-int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
- int64_t bytes, BdrvRequestFlags flags);
int generated_co_wrapper blk_truncate(BlockBackend *blk, int64_t offset,
bool exact, PreallocMode prealloc,
BdrvRequestFlags flags, Error **errp);
diff --git a/block/block-backend.c b/block/block-backend.c
index d0450ffd22..f3d6525923 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1314,6 +1314,17 @@ blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes,
return ret;
}
+int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes,
+ void *buf, BdrvRequestFlags flags)
+{
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+ IO_OR_GS_CODE();
+
+ assert(bytes <= SIZE_MAX);
+
+ return blk_co_preadv(blk, offset, bytes, &qiov, flags);
+}
+
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags)
@@ -1395,6 +1406,17 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,
return ret;
}
+int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
+ const void *buf, BdrvRequestFlags flags)
+{
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
+ IO_OR_GS_CODE();
+
+ assert(bytes <= SIZE_MAX);
+
+ return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
+}
+
int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags)
--
2.35.3
next prev parent reply other threads:[~2022-07-12 18:31 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 18:05 [PULL 00/35] Block patches Hanna Reitz
2022-07-12 18:05 ` [PULL 01/35] block: Add a 'flags' param to bdrv_{pread, pwrite, pwrite_sync}() Hanna Reitz
2022-07-12 18:05 ` [PULL 02/35] block: Change bdrv_{pread, pwrite, pwrite_sync}() param order Hanna Reitz
2022-07-12 18:05 ` [PULL 03/35] block: Make bdrv_{pread,pwrite}() return 0 on success Hanna Reitz
2022-07-12 18:05 ` [PULL 04/35] crypto: Make block callbacks " Hanna Reitz
2022-07-12 18:05 ` [PULL 05/35] block: Make bdrv_co_pwrite() take a const buffer Hanna Reitz
2022-07-12 18:05 ` [PULL 06/35] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() an int64_t Hanna Reitz
2022-07-12 18:05 ` [PULL 07/35] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper Hanna Reitz
2022-07-12 18:05 ` [PULL 08/35] block: Add bdrv_co_pwrite_sync() Hanna Reitz
2022-07-12 18:05 ` [PULL 09/35] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn Hanna Reitz
2022-07-12 18:05 ` [PULL 10/35] block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty() Hanna Reitz
2022-07-12 18:05 ` [PULL 11/35] tests/qemu-iotests: hotfix for 307, 223 output Hanna Reitz
2022-07-12 18:05 ` [PULL 12/35] tests/qemu-iotests: skip 108 when FUSE is not loaded Hanna Reitz
2022-07-12 18:05 ` [PULL 13/35] block: Make blk_{pread,pwrite}() return 0 on success Hanna Reitz
2022-07-12 18:05 ` [PULL 14/35] block: Add a 'flags' param to blk_pread() Hanna Reitz
2022-07-12 18:05 ` [PULL 15/35] block: Change blk_{pread,pwrite}() param order Hanna Reitz
2022-07-12 18:05 ` [PULL 16/35] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t Hanna Reitz
2022-07-12 18:05 ` [PULL 17/35] block: Make blk_co_pwrite() take a const buffer Hanna Reitz
2022-07-12 18:06 ` [PULL 18/35] block: Implement blk_{pread, pwrite}() using generated_co_wrapper Hanna Reitz
2022-07-12 18:06 ` [PULL 19/35] block: Add blk_{preadv,pwritev}() Hanna Reitz
2022-07-12 18:06 ` [PULL 20/35] block: Add blk_[co_]preadv_part() Hanna Reitz
2022-07-12 18:06 ` [PULL 21/35] block: Export blk_pwritev_part() in block-backend-io.h Hanna Reitz
2022-07-12 18:06 ` [PULL 22/35] block: Change blk_pwrite_compressed() param order Hanna Reitz
2022-07-12 18:06 ` [PULL 23/35] block: Add blk_co_pwrite_compressed() Hanna Reitz
2022-07-12 18:06 ` [PULL 24/35] block: Implement blk_pwrite_zeroes() using generated_co_wrapper Hanna Reitz
2022-07-12 18:06 ` [PULL 25/35] block: Implement blk_pdiscard() " Hanna Reitz
2022-07-12 18:06 ` [PULL 26/35] block: Implement blk_flush() " Hanna Reitz
2022-07-12 18:06 ` [PULL 27/35] block: Add blk_co_ioctl() Hanna Reitz
2022-07-12 18:06 ` [PULL 28/35] block: Add blk_co_truncate() Hanna Reitz
2022-07-12 18:06 ` Hanna Reitz [this message]
2022-07-12 18:06 ` [PULL 30/35] block: Remove remaining unused symbols in coroutines.h Hanna Reitz
2022-07-12 18:06 ` [PULL 31/35] qsd: Do not use error_report() before monitor_init Hanna Reitz
2022-07-12 18:06 ` [PULL 32/35] iotests/297: Have mypy ignore unused ignores Hanna Reitz
2022-07-12 18:08 ` [PULL 33/35] qsd: Unlink absolute PID file path Hanna Reitz
2022-07-12 18:08 ` [PULL 34/35] vl: Conditionally register PID file unlink notifier Hanna Reitz
2022-07-12 18:08 ` [PULL 35/35] vl: Unlink absolute PID file path Hanna Reitz
2022-07-13 20:47 ` [PULL 00/35] Block patches Peter Maydell
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=20220712180617.1362407-30-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).