[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/18] block: Add blk_{preadv,pwritev}()
From: |
Alberto Faria |
Subject: |
[PATCH v2 07/18] block: Add blk_{preadv,pwritev}() |
Date: |
Tue, 5 Jul 2022 17:15:15 +0100 |
Implement them using generated_co_wrapper.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
include/sysemu/block-backend-io.h | 6 +++++
tests/unit/test-block-iothread.c | 42 ++++++++++++++++++++++++++++++-
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/include/sysemu/block-backend-io.h
b/include/sysemu/block-backend-io.h
index 0804ce1c1d..3b548a8ae1 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -108,6 +108,9 @@ int generated_co_wrapper blk_pread(BlockBackend *blk,
int64_t offset,
int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,
int64_t bytes, const 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);
@@ -115,6 +118,9 @@ 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);
diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
index 0ced5333ff..b9c5da3a87 100644
--- a/tests/unit/test-block-iothread.c
+++ b/tests/unit/test-block-iothread.c
@@ -138,6 +138,36 @@ static void test_sync_op_blk_pwrite(BlockBackend *blk)
g_assert_cmpint(ret, ==, -EIO);
}
+static void test_sync_op_blk_preadv(BlockBackend *blk)
+{
+ uint8_t buf[512];
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, sizeof(buf));
+ int ret;
+
+ /* Success */
+ ret = blk_preadv(blk, 0, sizeof(buf), &qiov, 0);
+ g_assert_cmpint(ret, ==, 0);
+
+ /* Early error: Negative offset */
+ ret = blk_preadv(blk, -2, sizeof(buf), &qiov, 0);
+ g_assert_cmpint(ret, ==, -EIO);
+}
+
+static void test_sync_op_blk_pwritev(BlockBackend *blk)
+{
+ uint8_t buf[512] = { 0 };
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, sizeof(buf));
+ int ret;
+
+ /* Success */
+ ret = blk_pwritev(blk, 0, sizeof(buf), &qiov, 0);
+ g_assert_cmpint(ret, ==, 0);
+
+ /* Early error: Negative offset */
+ ret = blk_pwritev(blk, -2, sizeof(buf), &qiov, 0);
+ g_assert_cmpint(ret, ==, -EIO);
+}
+
static void test_sync_op_load_vmstate(BdrvChild *c)
{
uint8_t buf[512];
@@ -301,6 +331,14 @@ const SyncOpTest sync_op_tests[] = {
.name = "/sync-op/pwrite",
.fn = test_sync_op_pwrite,
.blkfn = test_sync_op_blk_pwrite,
+ }, {
+ .name = "/sync-op/preadv",
+ .fn = NULL,
+ .blkfn = test_sync_op_blk_preadv,
+ }, {
+ .name = "/sync-op/pwritev",
+ .fn = NULL,
+ .blkfn = test_sync_op_blk_pwritev,
}, {
.name = "/sync-op/load_vmstate",
.fn = test_sync_op_load_vmstate,
@@ -349,7 +387,9 @@ static void test_sync_op(const void *opaque)
blk_set_aio_context(blk, ctx, &error_abort);
aio_context_acquire(ctx);
- t->fn(c);
+ if (t->fn) {
+ t->fn(c);
+ }
if (t->blkfn) {
t->blkfn(blk);
}
--
2.36.1
- [PATCH v2 00/18] Make block-backend-io.h API more consistent, Alberto Faria, 2022/07/05
- [PATCH v2 01/18] block: Make blk_{pread, pwrite}() return 0 on success, Alberto Faria, 2022/07/05
- [PATCH v2 02/18] block: Add a 'flags' param to blk_pread(), Alberto Faria, 2022/07/05
- [PATCH v2 03/18] block: Change blk_{pread,pwrite}() param order, Alberto Faria, 2022/07/05
- [PATCH v2 04/18] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t, Alberto Faria, 2022/07/05
- [PATCH v2 05/18] block: Make blk_co_pwrite() take a const buffer, Alberto Faria, 2022/07/05
- [PATCH v2 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 07/18] block: Add blk_{preadv,pwritev}(),
Alberto Faria <=
- [PATCH v2 08/18] block: Add blk_[co_]preadv_part(), Alberto Faria, 2022/07/05
- [PATCH v2 09/18] block: Export blk_pwritev_part() in block-backend-io.h, Alberto Faria, 2022/07/05
- [PATCH v2 11/18] block: Add blk_co_pwrite_compressed(), Alberto Faria, 2022/07/05
- [PATCH v2 10/18] block: Change blk_pwrite_compressed() param order, Alberto Faria, 2022/07/05
- [PATCH v2 12/18] block: Implement blk_pwrite_zeroes() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 13/18] block: Implement blk_pdiscard() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 14/18] block: Implement blk_flush() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 15/18] block: Add blk_co_ioctl(), Alberto Faria, 2022/07/05
- [PATCH v2 17/18] block: Reorganize some declarations in block-backend-io.h, Alberto Faria, 2022/07/05