[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/18] io: remove checking of EWOULDBLOCK
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 12/18] io: remove checking of EWOULDBLOCK |
Date: |
Thu, 10 Mar 2016 17:26:59 +0000 |
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 <address@hidden>
---
io/channel-command.c | 6 ++----
io/channel-file.c | 6 ++----
io/channel-socket.c | 6 ++----
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/io/channel-command.c b/io/channel-command.c
index f53ce0f..604514a 100644
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -236,8 +236,7 @@ static ssize_t qio_channel_command_readv(QIOChannel *ioc,
retry:
ret = readv(cioc->readfd, iov, niov);
if (ret < 0) {
- if (errno == EAGAIN ||
- errno == EWOULDBLOCK) {
+ if (errno == EAGAIN) {
return QIO_CHANNEL_ERR_BLOCK;
}
if (errno == EINTR) {
@@ -265,8 +264,7 @@ static ssize_t qio_channel_command_writev(QIOChannel *ioc,
retry:
ret = writev(cioc->writefd, iov, niov);
if (ret <= 0) {
- if (errno == EAGAIN ||
- errno == EWOULDBLOCK) {
+ if (errno == EAGAIN) {
return QIO_CHANNEL_ERR_BLOCK;
}
if (errno == EINTR) {
diff --git a/io/channel-file.c b/io/channel-file.c
index 19a4325..f28e2b0 100644
--- a/io/channel-file.c
+++ b/io/channel-file.c
@@ -96,8 +96,7 @@ static ssize_t qio_channel_file_readv(QIOChannel *ioc,
retry:
ret = readv(fioc->fd, iov, niov);
if (ret < 0) {
- if (errno == EAGAIN ||
- errno == EWOULDBLOCK) {
+ if (errno == EAGAIN) {
return QIO_CHANNEL_ERR_BLOCK;
}
if (errno == EINTR) {
@@ -125,8 +124,7 @@ static ssize_t qio_channel_file_writev(QIOChannel *ioc,
retry:
ret = writev(fioc->fd, iov, niov);
if (ret <= 0) {
- if (errno == EAGAIN ||
- errno == EWOULDBLOCK) {
+ if (errno == EAGAIN) {
return QIO_CHANNEL_ERR_BLOCK;
}
if (errno == EINTR) {
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 9b5f2d8..2387d97 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -466,8 +466,7 @@ static ssize_t qio_channel_socket_readv(QIOChannel *ioc,
retry:
ret = recvmsg(sioc->fd, &msg, sflags);
if (ret < 0) {
- if (socket_error() == EAGAIN ||
- socket_error() == EWOULDBLOCK) {
+ if (socket_error() == EAGAIN) {
return QIO_CHANNEL_ERR_BLOCK;
}
if (socket_error() == EINTR) {
@@ -526,8 +525,7 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,
retry:
ret = sendmsg(sioc->fd, &msg, 0);
if (ret <= 0) {
- if (socket_error() == EAGAIN ||
- socket_error() == EWOULDBLOCK) {
+ if (socket_error() == EAGAIN) {
return QIO_CHANNEL_ERR_BLOCK;
}
if (socket_error() == EINTR) {
--
2.5.0
- [Qemu-devel] [PATCH v2 00/18] Multiple fixes & improvements to QIOChannel & Win32, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 01/18] osdep: fix socket_error() to work with Mingw64, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 03/18] io: initialize sockets in test program, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 02/18] io: use bind() to check for IPv4/6 availability, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 06/18] io: set correct error object in background reader test thread, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 07/18] io: assert errors before asserting content in I/O test, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 05/18] io: wait for incoming client in socket test, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 04/18] io: bind to socket before creating QIOChannelSocket, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 12/18] io: remove checking of EWOULDBLOCK,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 08/18] io: fix copy+paste mistake in socket error message, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 09/18] io: pass HANDLE to g_source_add_poll on Win32, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 11/18] io: use qemu_accept to ensure SOCK_CLOEXEC is set, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 13/18] io: implement socket watch for win32 using WSAEventSelect+select, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 10/18] io: introduce qio_channel_create_socket_watch, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 14/18] char: remove qemu_chr_finish_socket_connection method, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 16/18] char: remove qemu_chr_open_socket_fd method, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 15/18] char: remove socket_try_connect method, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 18/18] osdep: remove use of socket_error() from all code, Daniel P. Berrange, 2016/03/10
- [Qemu-devel] [PATCH v2 17/18] osdep: add wrappers for socket functions, Daniel P. Berrange, 2016/03/10