From patchwork Thu Mar 15 21:00:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 147084 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 58595B6EF3 for ; Fri, 16 Mar 2012 08:09:26 +1100 (EST) Received: from localhost ([::1]:58265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8HvH-0002c7-Kc for incoming@patchwork.ozlabs.org; Thu, 15 Mar 2012 17:09:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8Hv8-0002bd-3E for qemu-devel@nongnu.org; Thu, 15 Mar 2012 17:09:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8Hv5-000216-3g for qemu-devel@nongnu.org; Thu, 15 Mar 2012 17:09:13 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:48765) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8Hv4-00020h-Ob for qemu-devel@nongnu.org; Thu, 15 Mar 2012 17:09:11 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 7A40BA0B20; Fri, 16 Mar 2012 01:00:22 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 0770965EC; Fri, 16 Mar 2012 01:00:20 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Fri, 16 Mar 2012 01:00:13 +0400 Message-Id: <1331845217-21705-8-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331845217-21705-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1331845217-21705-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 86.62.121.231 Cc: Paolo Bonzini , Michael Tokarev Subject: [Qemu-devel] [PATCHv4 07/11] change qemu_iovec_to_buf() to match other to, from_buf functions 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 It now allows specifying offset within qiov to start from and amount of bytes to copy. Actual implementation is just a call to iov_to_buf(). Signed-off-by: Michael Tokarev --- block.c | 2 +- block/iscsi.c | 2 +- block/qcow.c | 2 +- block/qcow2.c | 2 +- block/rbd.c | 2 +- block/vdi.c | 2 +- cutils.c | 11 +++-------- qemu-common.h | 3 ++- 8 files changed, 11 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index 6e689af..9675b27 100644 --- a/block.c +++ b/block.c @@ -3270,7 +3270,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb); if (is_write) { - qemu_iovec_to_buffer(acb->qiov, acb->bounce); + qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size); acb->ret = bs->drv->bdrv_write(bs, sector_num, acb->bounce, nb_sectors); } else { acb->ret = bs->drv->bdrv_read(bs, sector_num, acb->bounce, nb_sectors); diff --git a/block/iscsi.c b/block/iscsi.c index bd3ca11..db589f5 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -223,7 +223,7 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, /* this will allow us to get rid of 'buf' completely */ size = nb_sectors * BDRV_SECTOR_SIZE; acb->buf = g_malloc(size); - qemu_iovec_to_buffer(acb->qiov, acb->buf); + qemu_iovec_to_buf(acb->qiov, 0, acb->buf, size); acb->task = iscsi_write10_task(iscsi, iscsilun->lun, acb->buf, size, sector_qemu2lun(sector_num, iscsilun), fua, 0, iscsilun->block_size, diff --git a/block/qcow.c b/block/qcow.c index 562a19c..a367459 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -569,7 +569,7 @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num, if (qiov->niov > 1) { buf = orig_buf = qemu_blockalign(bs, qiov->size); - qemu_iovec_to_buffer(qiov, buf); + qemu_iovec_to_buf(qiov, 0, buf, qiov->size); } else { orig_buf = NULL; buf = (uint8_t *)qiov->iov->iov_base; diff --git a/block/qcow2.c b/block/qcow2.c index 47940fd..a9569b1 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -609,7 +609,7 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, assert(hd_qiov.size <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); - qemu_iovec_to_buffer(&hd_qiov, cluster_data); + qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size); qcow2_encrypt_sectors(s, sector_num, cluster_data, cluster_data, cur_nr_sectors, 1, &s->aes_encrypt_key); diff --git a/block/rbd.c b/block/rbd.c index 46a8579..0191f86 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -644,7 +644,7 @@ static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDriverState *bs, acb->bh = NULL; if (write) { - qemu_iovec_to_buffer(acb->qiov, acb->bounce); + qemu_iovec_to_buffer(acb->qiov, 0, acb->bounce, qiov->size); } buf = acb->bounce; diff --git a/block/vdi.c b/block/vdi.c index 24f4027..30a5e27 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -524,7 +524,7 @@ static VdiAIOCB *vdi_aio_setup(BlockDriverState *bs, int64_t sector_num, acb->buf = qemu_blockalign(bs, qiov->size); acb->orig_buf = acb->buf; if (is_write) { - qemu_iovec_to_buffer(qiov, acb->buf); + qemu_iovec_to_buf(qiov, 0, acb->buf, qiov->size); } } else { acb->buf = (uint8_t *)qiov->iov->iov_base; diff --git a/cutils.c b/cutils.c index 1aeac15..352bc52 100644 --- a/cutils.c +++ b/cutils.c @@ -220,15 +220,10 @@ void qemu_iovec_reset(QEMUIOVector *qiov) qiov->size = 0; } -void qemu_iovec_to_buffer(QEMUIOVector *qiov, void *buf) +size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset, + void *buf, size_t bytes) { - uint8_t *p = (uint8_t *)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; - } + return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes); } size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset, diff --git a/qemu-common.h b/qemu-common.h index 7208381..547f2a0 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -341,7 +341,8 @@ void qemu_iovec_concat(QEMUIOVector *dst, QEMUIOVector *src, size_t soffset, size_t sbytes); void qemu_iovec_destroy(QEMUIOVector *qiov); void qemu_iovec_reset(QEMUIOVector *qiov); -void qemu_iovec_to_buffer(QEMUIOVector *qiov, void *buf); +size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset, + void *buf, size_t bytes); size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset, const void *buf, size_t bytes); size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,