| Message ID | 20220517113837.199696-5-afaria@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Make block-backend-io.h API more consistent | expand |
On 5/17/22 13:38, Alberto Faria wrote: > Also convert it into a generated_co_wrapper. > > Signed-off-by: Alberto Faria <afaria@redhat.com> > --- > block/block-backend.c | 14 -------------- > block/coroutines.h | 5 ----- > include/sysemu/block-backend-io.h | 4 ++++ > tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ > 4 files changed, 23 insertions(+), 19 deletions(-) Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
On 17.05.22 13:38, Alberto Faria wrote: > Also convert it into a generated_co_wrapper. > > Signed-off-by: Alberto Faria <afaria@redhat.com> > --- > block/block-backend.c | 14 -------------- > block/coroutines.h | 5 ----- > include/sysemu/block-backend-io.h | 4 ++++ > tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ > 4 files changed, 23 insertions(+), 19 deletions(-) [...] > diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c > index 2fa1248445..6061762c97 100644 > --- a/tests/unit/test-block-iothread.c > +++ b/tests/unit/test-block-iothread.c > @@ -183,6 +183,21 @@ static void test_sync_op_blk_preadv_part(BlockBackend *blk) > g_assert_cmpint(ret, ==, -EIO); > } > > +static void test_sync_op_blk_pwritev_part(BlockBackend *blk) > +{ > + uint8_t buf[512]; Given you’ve initialized this in test_sync_op_blk_pwritev(), I think it should be initialized here, too. With that done: Reviewed-by: Hanna Reitz <hreitz@redhat.com> > + QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, sizeof(buf)); > + int ret; > + > + /* Success */ > + ret = blk_pwritev_part(blk, 0, sizeof(buf), &qiov, 0, 0); > + g_assert_cmpint(ret, ==, 0); > + > + /* Early error: Negative offset */ > + ret = blk_pwritev_part(blk, -2, sizeof(buf), &qiov, 0, 0); > + g_assert_cmpint(ret, ==, -EIO); > +} > +
diff --git a/block/block-backend.c b/block/block-backend.c index 3920e1f45e..35bf35aadd 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1407,20 +1407,6 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, return blk_co_pwritev_part(blk, offset, bytes, qiov, 0, flags); } -static int coroutine_fn blk_pwritev_part(BlockBackend *blk, int64_t offset, - int64_t bytes, - QEMUIOVector *qiov, size_t qiov_offset, - BdrvRequestFlags flags) -{ - int ret; - - blk_inc_in_flight(blk); - ret = blk_do_pwritev_part(blk, offset, bytes, qiov, qiov_offset, flags); - blk_dec_in_flight(blk); - - return ret; -} - typedef struct BlkRwCo { BlockBackend *blk; int64_t offset; diff --git a/block/coroutines.h b/block/coroutines.h index 85423f8db6..94fd283f62 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -107,11 +107,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_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, size_t qiov_offset, - BdrvRequestFlags flags); - int generated_co_wrapper blk_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h index 29954a466c..31ebd8b6cf 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -121,6 +121,10 @@ int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, int coroutine_fn blk_co_preadv(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, + BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c index 2fa1248445..6061762c97 100644 --- a/tests/unit/test-block-iothread.c +++ b/tests/unit/test-block-iothread.c @@ -183,6 +183,21 @@ static void test_sync_op_blk_preadv_part(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_pwritev_part(BlockBackend *blk) +{ + uint8_t buf[512]; + QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, sizeof(buf)); + int ret; + + /* Success */ + ret = blk_pwritev_part(blk, 0, sizeof(buf), &qiov, 0, 0); + g_assert_cmpint(ret, ==, 0); + + /* Early error: Negative offset */ + ret = blk_pwritev_part(blk, -2, sizeof(buf), &qiov, 0, 0); + g_assert_cmpint(ret, ==, -EIO); +} + static void test_sync_op_load_vmstate(BdrvChild *c) { uint8_t buf[512]; @@ -358,6 +373,10 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/preadv_part", .fn = NULL, .blkfn = test_sync_op_blk_preadv_part, + }, { + .name = "/sync-op/pwritev_part", + .fn = NULL, + .blkfn = test_sync_op_blk_pwritev_part, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,
Also convert it into a generated_co_wrapper. Signed-off-by: Alberto Faria <afaria@redhat.com> --- block/block-backend.c | 14 -------------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 4 ++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 19 deletions(-)