From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTXLg-0006uB-Q8 for qemu-devel@nongnu.org; Wed, 22 Jul 2009 04:38:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTXLb-0006rf-6s for qemu-devel@nongnu.org; Wed, 22 Jul 2009 04:38:51 -0400 Received: from [199.232.76.173] (port=42215 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTXLa-0006rZ-Lx for qemu-devel@nongnu.org; Wed, 22 Jul 2009 04:38:46 -0400 Received: from mail08.svc.cra.dublin.eircom.net ([159.134.118.24]:47871) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MTXLa-0007QH-8U for qemu-devel@nongnu.org; Wed, 22 Jul 2009 04:38:46 -0400 From: Mark McLoughlin Date: Wed, 22 Jul 2009 09:11:38 +0100 Message-Id: <1248250302-28595-1-git-send-email-markmc@redhat.com> In-Reply-To: <1248250235.2867.34.camel@blaa> References: <1248250235.2867.34.camel@blaa> Subject: [Qemu-devel] [PATCH 1/5] Make tcp_chr_read() use recvmsg() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin Split out tcp_chr_recv() out of tcp_chr_read() and implement it on non-win32 using recvmsg(). This is needed for a subsequent patch which implements SCM_RIGHTS support. Signed-off-by: Mark McLoughlin --- qemu-char.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 287e0cd..9886228 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1907,6 +1907,29 @@ static void tcp_chr_process_IAC_bytes(CharDriverState *chr, *size = j; } +#ifndef WIN32 +static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) +{ + TCPCharDriver *s = chr->opaque; + struct msghdr msg = { 0, }; + struct iovec iov[1]; + + iov[0].iov_base = buf; + iov[0].iov_len = len; + + msg.msg_iov = iov; + msg.msg_iovlen = 1; + + return recvmsg(s->fd, &msg, 0); +} +#else +static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) +{ + TCPCharDriver *s = chr->opaque; + return recv(s->fd, buf, len, 0); +} +#endif + static void tcp_chr_read(void *opaque) { CharDriverState *chr = opaque; @@ -1919,7 +1942,7 @@ static void tcp_chr_read(void *opaque) len = sizeof(buf); if (len > s->max_size) len = s->max_size; - size = recv(s->fd, (void *)buf, len, 0); + size = tcp_chr_recv(chr, (void *)buf, len); if (size == 0) { /* connection closed */ s->connected = 0; -- 1.6.2.5