From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIa1y-00059y-Am for qemu-devel@nongnu.org; Fri, 24 Jul 2015 06:16:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZIa1w-0000ig-Ca for qemu-devel@nongnu.org; Fri, 24 Jul 2015 06:16:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIa1w-0000ia-7N for qemu-devel@nongnu.org; Fri, 24 Jul 2015 06:16:40 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E95FABDD94 for ; Fri, 24 Jul 2015 10:16:39 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6OAGZf1001711 for ; Fri, 24 Jul 2015 06:16:39 -0400 From: Paolo Bonzini Date: Fri, 24 Jul 2015 12:16:23 +0200 Message-Id: <1437732994-20478-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1437732994-20478-1-git-send-email-pbonzini@redhat.com> References: <1437732994-20478-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 02/13] qemu-char: handle EINTR for TCP character devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- qemu-char.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 617e034..3200200 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2797,7 +2797,10 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) #ifdef MSG_CMSG_CLOEXEC flags |= MSG_CMSG_CLOEXEC; #endif - ret = recvmsg(s->fd, &msg, flags); + do { + ret = recvmsg(s->fd, &msg, flags); + } while (ret == -1 && errno == EINTR); + if (ret > 0 && s->is_unix) { unix_process_msgfd(chr, &msg); } @@ -2808,7 +2811,13 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len) { TCPCharDriver *s = chr->opaque; - return qemu_recv(s->fd, buf, len, 0); + ssize_t ret; + + do { + ret = qemu_recv(s->fd, buf, len, 0); + } while (ret == -1 && socket_error() == EINTR); + + return ret; } #endif -- 2.4.3