From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue, 1 Oct 2019 13:26:07 +0000 (+0400)
Subject: util: WSAEWOULDBLOCK on connect should map to EINPROGRESS
X-Git-Tag: v4.2.0-rc0~71^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1cd5d41efe0eef5d536466ee17464368b028dd2;p=thirdparty%2Fqemu.git

util: WSAEWOULDBLOCK on connect should map to EINPROGRESS

In general, WSAEWOULDBLOCK can be mapped to EAGAIN as done by
socket_error() (or EWOULDBLOCK). But for connect() with non-blocking
sockets, it actually means the operation is in progress:

https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect
"The socket is marked as nonblocking and the connection cannot be completed immediately."

(this is also the behaviour implemented by GLib GSocket)

This fixes socket_can_bind_connect() test on win32.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index c62cd4328c5..886e400d6af 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -585,7 +585,11 @@ int qemu_connect_wrap(int sockfd, const struct sockaddr *addr,
     int ret;
     ret = connect(sockfd, addr, addrlen);
     if (ret < 0) {
-        errno = socket_error();
+        if (WSAGetLastError() == WSAEWOULDBLOCK) {
+            errno = EINPROGRESS;
+        } else {
+            errno = socket_error();
+        }
     }
     return ret;
 }