falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-char: handle EINTR for TCP character devices 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 9172f428af)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Paolo Bonzini 2015-07-21 09:25:54 +02:00 committed by Michael Roth
parent 35c30d3efd
commit 35a616edef
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-char.c
View File

@ -2797,7 +2797,10 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len)
#ifdef MSG_CMSG_CLOEXEC #ifdef MSG_CMSG_CLOEXEC
flags |= MSG_CMSG_CLOEXEC; flags |= MSG_CMSG_CLOEXEC;
#endif #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) { if (ret > 0 && s->is_unix) {
unix_process_msgfd(chr, &msg); 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) static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len)
{ {
TCPCharDriver *s = chr->opaque; 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 #endif