From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEoV-0001pc-6m for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:29:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwEoS-00051d-6f for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:29:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEoR-00051Q-TZ for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:29:04 -0500 From: Stefan Hajnoczi Date: Fri, 18 Jan 2013 17:28:39 +0100 Message-Id: <1358526521-24300-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1358526521-24300-1-git-send-email-stefanha@redhat.com> References: <1358526521-24300-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] win32-aio: use iov utility functions instead of open-coding them List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Michael Tokarev , Stefan Hajnoczi From: 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: Stefan Hajnoczi --- block/win32-aio.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/block/win32-aio.c b/block/win32-aio.c index b9236ea..5d0fbbf 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -29,6 +29,7 @@ #include "block/aio.h" #include "raw-aio.h" #include "qemu/event_notifier.h" +#include "qemu/iov.h" #include #include @@ -80,13 +81,7 @@ 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(qiov->iov[i].iov_base, p, qiov->iov[i].iov_len); - p += qiov->iov[i].iov_len; - } + iov_from_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->size); } qemu_vfree(waiocb->buf); } @@ -153,13 +148,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.8.0.2