[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 14/17] tests/test-bdrv-drain: use QEMU_IOVEC_INIT
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v4 14/17] tests/test-bdrv-drain: use QEMU_IOVEC_INIT_BUF |
Date: |
Mon, 18 Feb 2019 17:09:23 +0300 |
Use new QEMU_IOVEC_INIT_BUF() instead of
qemu_iovec_init_external( ... , 1), which simplifies the code.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
tests/test-bdrv-drain.c | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index ee1740ff06..821be405f0 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -204,12 +204,7 @@ static void test_drv_cb_common(enum drain_type drain_type,
bool recursive)
BlockAIOCB *acb;
int aio_ret;
- QEMUIOVector qiov;
- struct iovec iov = {
- .iov_base = NULL,
- .iov_len = 0,
- };
- qemu_iovec_init_external(&qiov, &iov, 1);
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, NULL, 0);
blk = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
bs = bdrv_new_open_driver(&bdrv_test, "test-node", BDRV_O_RDWR,
@@ -670,12 +665,7 @@ static void test_iothread_common(enum drain_type
drain_type, int drain_thread)
AioContext *ctx_a = iothread_get_aio_context(a);
AioContext *ctx_b = iothread_get_aio_context(b);
- QEMUIOVector qiov;
- struct iovec iov = {
- .iov_base = NULL,
- .iov_len = 0,
- };
- qemu_iovec_init_external(&qiov, &iov, 1);
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, NULL, 0);
/* bdrv_drain_all() may only be called from the main loop thread */
if (drain_type == BDRV_DRAIN_ALL && drain_thread != 0) {
@@ -1148,13 +1138,7 @@ static void coroutine_fn test_co_delete_by_drain(void
*opaque)
BlockDriverState *bs = blk_bs(blk);
BDRVTestTopState *tts = bs->opaque;
void *buffer = g_malloc(65536);
- QEMUIOVector qiov;
- struct iovec iov = {
- .iov_base = buffer,
- .iov_len = 65536,
- };
-
- qemu_iovec_init_external(&qiov, &iov, 1);
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buffer, 65536);
/* Pretend some internal write operation from parent to child.
* Important: We have to read from the child, not from the parent!
@@ -1365,12 +1349,7 @@ static void test_detach_indirect(bool by_parent_cb)
BdrvChild *child_a, *child_b;
BlockAIOCB *acb;
- QEMUIOVector qiov;
- struct iovec iov = {
- .iov_base = NULL,
- .iov_len = 0,
- };
- qemu_iovec_init_external(&qiov, &iov, 1);
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, NULL, 0);
if (!by_parent_cb) {
detach_by_driver_cb_role = child_file;
--
2.18.0
- [Qemu-block] [PATCH v4 08/17] block/qcow: use qemu_iovec_init_buf, (continued)
- [Qemu-block] [PATCH v4 08/17] block/qcow: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 09/17] block/qcow2: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 15/17] hw/ide: drop iov field from IDEState, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 07/17] block/parallels: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 04/17] block/backup: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 03/17] block/block-backend: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 05/17] block/commit: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 10/17] block/qed: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 06/17] block/stream: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 13/17] migration/block: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 14/17] tests/test-bdrv-drain: use QEMU_IOVEC_INIT_BUF,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v4 11/17] block/vmdk: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- Re: [Qemu-block] [Qemu-devel] [PATCH v4 00/17] block: local qiov helper, Stefan Hajnoczi, 2019/02/20