From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFte-0002fK-4b for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxFtV-00023k-0F for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:26 -0400 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:41498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFtU-00023L-QK for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:16 -0400 Received: by mail-we0-f174.google.com with SMTP id u57so871325wes.33 for ; Wed, 18 Jun 2014 06:27:16 -0700 (PDT) Received: from yakj.station (net-37-117-140-88.cust.vodafonedsl.it. [37.117.140.88]) by mx.google.com with ESMTPSA id l5sm3853238wif.22.2014.06.18.06.27.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2014 06:27:15 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 15:26:48 +0200 Message-Id: <1403098014-1522-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> References: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 08/14] util: add return value to qemu_iovec_concat_iov List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This will be necessary later to recognize the case where a request has both dataout and datain. Signed-off-by: Paolo Bonzini --- include/qemu-common.h | 6 +++--- util/iov.c | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 66ceceb..ae76197 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -315,9 +315,9 @@ void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov); void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len); void qemu_iovec_concat(QEMUIOVector *dst, QEMUIOVector *src, size_t soffset, size_t sbytes); -void qemu_iovec_concat_iov(QEMUIOVector *dst, - struct iovec *src_iov, unsigned int src_cnt, - size_t soffset, size_t sbytes); +size_t qemu_iovec_concat_iov(QEMUIOVector *dst, + struct iovec *src_iov, unsigned int src_cnt, + size_t soffset, size_t sbytes); bool qemu_iovec_is_zero(QEMUIOVector *qiov); void qemu_iovec_destroy(QEMUIOVector *qiov); void qemu_iovec_reset(QEMUIOVector *qiov); diff --git a/util/iov.c b/util/iov.c index 49f8838..2b4f46d 100644 --- a/util/iov.c +++ b/util/iov.c @@ -295,15 +295,15 @@ void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len) * of src". * Only vector pointers are processed, not the actual data buffers. */ -void qemu_iovec_concat_iov(QEMUIOVector *dst, - struct iovec *src_iov, unsigned int src_cnt, - size_t soffset, size_t sbytes) +size_t qemu_iovec_concat_iov(QEMUIOVector *dst, + struct iovec *src_iov, unsigned int src_cnt, + size_t soffset, size_t sbytes) { int i; size_t done; if (!sbytes) { - return; + return 0; } assert(dst->nalloc != -1); for (i = 0, done = 0; done < sbytes && i < src_cnt; i++) { @@ -317,6 +317,8 @@ void qemu_iovec_concat_iov(QEMUIOVector *dst, } } assert(soffset == 0); /* offset beyond end of src */ + + return done; } /* -- 1.8.3.1