motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 05:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

io: remove checking of EWOULDBLOCK

Browse source 
Since we now canonicalize WSAEWOULDBLOCK into EAGAIN there is
no longer any need to explicitly check EWOULDBLOCK for Win32.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-03-10 17:17:33 +00:00
parent de7971ffb9
commit 30fd3e2790
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
io/channel-command.c
View file

@ -236,8 +236,7 @@ static ssize_t qio_channel_command_readv(QIOChannel *ioc,
retry: retry:
ret = readv(cioc->readfd, iov, niov); ret = readv(cioc->readfd, iov, niov);
if (ret < 0) { if (ret < 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {
@ -265,8 +264,7 @@ static ssize_t qio_channel_command_writev(QIOChannel *ioc,
retry: retry:
ret = writev(cioc->writefd, iov, niov); ret = writev(cioc->writefd, iov, niov);
if (ret <= 0) { if (ret <= 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {

6
io/channel-file.c
View file

@ -96,8 +96,7 @@ static ssize_t qio_channel_file_readv(QIOChannel *ioc,
retry: retry:
ret = readv(fioc->fd, iov, niov); ret = readv(fioc->fd, iov, niov);
if (ret < 0) { if (ret < 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {
@ -125,8 +124,7 @@ static ssize_t qio_channel_file_writev(QIOChannel *ioc,
retry: retry:
ret = writev(fioc->fd, iov, niov); ret = writev(fioc->fd, iov, niov);
if (ret <= 0) { if (ret <= 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {

6
io/channel-socket.c
View file

@ -466,8 +466,7 @@ static ssize_t qio_channel_socket_readv(QIOChannel *ioc,
retry: retry:
ret = recvmsg(sioc->fd, &msg, sflags); ret = recvmsg(sioc->fd, &msg, sflags);
if (ret < 0) { if (ret < 0) {
if (socket_error() == EAGAIN || if (socket_error() == EAGAIN) {
socket_error() == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (socket_error() == EINTR) { if (socket_error() == EINTR) {
@ -526,8 +525,7 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,
retry: retry:
ret = sendmsg(sioc->fd, &msg, 0); ret = sendmsg(sioc->fd, &msg, 0);
if (ret <= 0) { if (ret <= 0) {
if (socket_error() == EAGAIN || if (socket_error() == EAGAIN) {
socket_error() == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (socket_error() == EINTR) { if (socket_error() == EINTR) {