From patchwork Thu Jan 17 08:48:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 213178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BAD6B2C0091 for ; Thu, 17 Jan 2013 19:48:31 +1100 (EST) Received: from localhost ([::1]:52202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvl9C-00079F-08 for incoming@patchwork.ozlabs.org; Thu, 17 Jan 2013 03:48:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvl92-00074R-Rf for qemu-devel@nongnu.org; Thu, 17 Jan 2013 03:48:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tvl91-0003pG-Nk for qemu-devel@nongnu.org; Thu, 17 Jan 2013 03:48:20 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:46928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvl91-0003pC-GH for qemu-devel@nongnu.org; Thu, 17 Jan 2013 03:48:19 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 2D78CA1277; Thu, 17 Jan 2013 12:48:18 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 9FB59423; Thu, 17 Jan 2013 12:48:16 +0400 (MSK) From: Michael Tokarev To: Kevin Wolf Date: Thu, 17 Jan 2013 12:48:10 +0400 Message-Id: <1358412490-21346-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: pbonzini@redhat.com, Michael Tokarev , qemu-devel@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH] win32-aio: use iov utility functions instead of open-coding them X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 {