From patchwork Sat Mar 10 16:32:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 145868 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 6FAB2B6FA5 for ; Sun, 11 Mar 2012 03:52:30 +1100 (EST) Received: from localhost ([::1]:33542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6PH3-0003AA-33 for incoming@patchwork.ozlabs.org; Sat, 10 Mar 2012 11:36:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6PGd-00037T-PF for qemu-devel@nongnu.org; Sat, 10 Mar 2012 11:35:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6PGb-0006zo-QO for qemu-devel@nongnu.org; Sat, 10 Mar 2012 11:35:39 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:56195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6PGb-0006zf-IP for qemu-devel@nongnu.org; Sat, 10 Mar 2012 11:35:37 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id DF566A0728; Sat, 10 Mar 2012 20:35:35 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 72B572BB4; Sat, 10 Mar 2012 20:33:00 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sat, 10 Mar 2012 20:32:28 +0400 Message-Id: <1331397150-25700-4-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331397150-25700-1-git-send-email-mjt@tls.msk.ru> References: <1331397150-25700-1-git-send-email-mjt@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: Michael Tokarev Subject: [Qemu-devel] [PATCH 3/5] Export qemu_sendv_recvv() and use it in (inlined) qemu_sendv() and qemu_recvv() 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 Rename do_sendv_recvv() to qemu_sendv_recvv(), change its last arg (do_send) from int to bool, export it in qemu-common.h, and made the two callers of it (qemu_sendv() and qemu_recvv()) to be trivial #defines just adding 5th arg. qemu_sendv_recvv() will be used later. Signed-off-by: Michael Tokarev --- cutils.c | 15 ++------------- qemu-common.h | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cutils.c b/cutils.c index 89305ad..6d9175f 100644 --- a/cutils.c +++ b/cutils.c @@ -426,8 +426,8 @@ int qemu_parse_fd(const char *param) * The first `offset' bytes in the iovec buffer are skipped and next * `bytes' bytes are used. */ -static int do_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset, - int do_sendv) +int qemu_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset, + bool do_sendv) { int ret, iovlen; size_t diff; @@ -506,14 +506,3 @@ static int do_sendv_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t of last_iov->iov_len += diff; return ret; } - -int qemu_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) -{ - return do_sendv_recvv(sockfd, iov, bytes, offset, 0); -} - -int qemu_sendv(int sockfd, struct iovec *iov, size_t bytes, size_t offset) -{ - return do_sendv_recvv(sockfd, iov, bytes, offset, 1); -} - diff --git a/qemu-common.h b/qemu-common.h index c0536b3..474cbcc 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -199,8 +199,18 @@ int qemu_pipe(int pipefd[2]); #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags) #endif -int qemu_recvv(int sockfd, struct iovec *iov, size_t bytes, size_t offset); -int qemu_sendv(int sockfd, struct iovec *iov, size_t bytes, size_t offset); +/** + * Send or receive data from/to an (optionally partial) iovec. + * Instead of processing whole iovector, this routine can process + * not more than a specified number of bytes, and start not at + * the beginning of iovec but at byte position `offset'. + */ +int qemu_sendv_recvv(int sockfd, struct iovec *iov, + size_t bytes, size_t offset, bool do_sendv); +#define qemu_recvv(sockfd, iov, bytes, offset) \ + qemu_sendv_recvv(sockfd, iov, bytes, offset, false) +#define qemu_sendv(sockfd, iov, bytes, offset) \ + qemu_sendv_recvv(sockfd, iov, bytes, offset, true) /* Error handling. */