From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Hanna Reitz <hreitz@redhat.com>
Subject: [PULL 18/35] block: Implement blk_{pread, pwrite}() using generated_co_wrapper
Date: Tue, 12 Jul 2022 20:06:00 +0200 [thread overview]
Message-ID: <20220712180617.1362407-19-hreitz@redhat.com> (raw)
In-Reply-To: <20220712180617.1362407-1-hreitz@redhat.com>
From: Alberto Faria <afaria@redhat.com>
We need to add include/sysemu/block-backend-io.h to the inputs of the
block-gen.c target defined in block/meson.build.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220705161527.1054072-7-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/coroutines.h | 4 ----
include/sysemu/block-backend-io.h | 10 ++++++----
block/block-backend.c | 23 -----------------------
block/meson.build | 1 +
4 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/block/coroutines.h b/block/coroutines.h
index 3f41238b33..443ef2f2e6 100644
--- a/block/coroutines.h
+++ b/block/coroutines.h
@@ -112,10 +112,6 @@ bdrv_common_block_status_above(BlockDriverState *bs,
int generated_co_wrapper
nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp);
-int generated_co_wrapper
-blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes,
- QEMUIOVector *qiov, BdrvRequestFlags flags);
-
int generated_co_wrapper
blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes,
QEMUIOVector *qiov, size_t qiov_offset,
diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h
index b048476a47..750089fc9b 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -101,10 +101,12 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
* the "I/O or GS" API.
*/
-int blk_pread(BlockBackend *blk, int64_t offset, int64_t bytes, void *buf,
- BdrvRequestFlags flags);
-int blk_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
- const void *buf, BdrvRequestFlags flags);
+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,
+ BdrvRequestFlags flags);
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags);
diff --git a/block/block-backend.c b/block/block-backend.c
index 3203b25695..4d6c18bc39 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1563,29 +1563,6 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset,
flags | BDRV_REQ_ZERO_WRITE, cb, opaque);
}
-int blk_pread(BlockBackend *blk, int64_t offset, int64_t bytes, void *buf,
- BdrvRequestFlags flags)
-{
- int ret;
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
- IO_OR_GS_CODE();
-
- blk_inc_in_flight(blk);
- ret = blk_do_preadv(blk, offset, bytes, &qiov, flags);
- blk_dec_in_flight(blk);
-
- return ret;
-}
-
-int blk_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();
-
- return blk_pwritev_part(blk, offset, bytes, &qiov, 0, flags);
-}
-
int64_t blk_getlength(BlockBackend *blk)
{
IO_CODE();
diff --git a/block/meson.build b/block/meson.build
index 0b2a60c99b..60bc305597 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -136,6 +136,7 @@ block_gen_c = custom_target('block-gen.c',
input: files(
'../include/block/block-io.h',
'../include/block/block-global-state.h',
+ '../include/sysemu/block-backend-io.h',
'coroutines.h'
),
command: [wrapper_py, '@OUTPUT@', '@INPUT@'])
--
2.35.3
next prev parent reply other threads:[~2022-07-12 18:47 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 ` Hanna Reitz [this message]
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 ` [PULL 29/35] block: Reorganize some declarations in block-backend-io.h Hanna Reitz
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-19-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).