[Qemu-devel] [PATCH] win32-aio: use iov utility functions instead of open-coding them

[Michael Tokarev]

We have iov_from_buf() and iov_to_buf(), use them instead of
open-coding these in block/win32-aio.c

Signed-Off-By: Michael Tokarev <address@hidden>
---
 block/win32-aio.c |   18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/block/win32-aio.c b/block/win32-aio.c
index 0383370..773d3f4 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -79,14 +79,8 @@ static void win32_aio_process_completion(QEMUWin32AIOState 
*s,
 
     if (!waiocb->is_linear) {
         if (ret == 0 && waiocb->is_read) {
-            QEMUIOVector *qiov = waiocb->qiov;
-            char *p = waiocb->buf;
-            int i;
-
-            for (i = 0; i < qiov->niov; ++i) {
-                memcpy(p, qiov->iov[i].iov_base, qiov->iov[i].iov_len);
-                p += qiov->iov[i].iov_len;
-            }
+            iov_from_buf(waiocb->qiov.iov, waiocb->qiov.niov,
+                         0, waiocb->buf, waiocb->qiov.size);
             qemu_vfree(waiocb->buf);
         }
     }
@@ -153,13 +147,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs,
     if (qiov->niov > 1) {
         waiocb->buf = qemu_blockalign(bs, qiov->size);
         if (type & QEMU_AIO_WRITE) {
-            char *p = waiocb->buf;
-            int i;
-
-            for (i = 0; i < qiov->niov; ++i) {
-                memcpy(p, qiov->iov[i].iov_base, qiov->iov[i].iov_len);
-                p += qiov->iov[i].iov_len;
-            }
+            iov_to_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->size);
         }
         waiocb->is_linear = false;
     } else {
-- 
1.7.10.4