[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] qemu-coroutine-io: fix for Win32
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/10] qemu-coroutine-io: fix for Win32 |
Date: |
Wed, 9 Jul 2014 11:53:09 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 2 +-
qemu-coroutine-io.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/nbd.c b/nbd.c
index e7d1cee..5c28f71 100644
--- a/nbd.c
+++ b/nbd.c
@@ -156,7 +156,7 @@ ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool
do_read)
err = socket_error();
/* recoverable error */
- if (err == EINTR || (offset > 0 && err == EAGAIN)) {
+ if (err == EINTR || (offset > 0 && (err == EAGAIN || err ==
EWOULDBLOCK))) {
continue;
}
diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c
index 054ca70..d404926 100644
--- a/qemu-coroutine-io.c
+++ b/qemu-coroutine-io.c
@@ -34,13 +34,15 @@ qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned
iov_cnt,
{
size_t done = 0;
ssize_t ret;
+ int err;
while (done < bytes) {
ret = iov_send_recv(sockfd, iov, iov_cnt,
offset + done, bytes - done, do_send);
if (ret > 0) {
done += ret;
} else if (ret < 0) {
- if (errno == EAGAIN) {
+ err = socket_error();
+ if (err == EAGAIN || err == EWOULDBLOCK) {
qemu_coroutine_yield();
} else if (done == 0) {
return -1;
--
1.9.3
- [Qemu-devel] [PATCH for-2.2 00/10] AioContext cleanups and Win32 socket support, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 01/10] AioContext: take bottom halves into account when computing aio_poll timeout, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 03/10] aio-win32: Factor out duplicate code into aio_dispatch_handlers, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 02/10] aio-win32: Evaluate timers after handles, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 04/10] AioContext: run bottom halves after polling, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 05/10] AioContext: export and use aio_dispatch, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 06/10] test-aio: test timers on Windows too, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 07/10] aio-win32: add aio_set_dispatching optimization, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 08/10] AioContext: introduce aio_prepare, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 09/10] qemu-coroutine-io: fix for Win32,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/10] aio-win32: add support for sockets, Paolo Bonzini, 2014/07/09