From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, berrange@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
sw@weilnetz.de
Subject: [PATCH 1/3] util: WSAEWOULDBLOCK on connect should map to EINPROGRESS
Date: Tue, 1 Oct 2019 17:26:07 +0400 [thread overview]
Message-ID: <20191001132609.23184-2-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20191001132609.23184-1-marcandre.lureau@redhat.com>
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>
---
util/oslib-win32.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index c62cd4328c..886e400d6a 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;
}
--
2.23.0
next prev parent reply other threads:[~2019-10-01 13:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 13:26 [PATCH 0/3] Some win32 fixes Marc-André Lureau
2019-10-01 13:26 ` Marc-André Lureau [this message]
2019-10-01 13:56 ` [PATCH 1/3] util: WSAEWOULDBLOCK on connect should map to EINPROGRESS Philippe Mathieu-Daudé
2019-10-01 13:26 ` [PATCH 2/3] tests: skip serial test on windows Marc-André Lureau
2019-10-01 13:48 ` Philippe Mathieu-Daudé
2019-10-01 13:26 ` [PATCH 3/3] win32: fix main-loop busy loop on socket/fd event Marc-André Lureau
2019-10-01 21:20 ` James Le Cuirot
2019-10-01 13:39 ` [PATCH 0/3] Some win32 fixes Paolo Bonzini
2019-10-01 13:44 ` Peter Maydell
2019-10-01 13:54 ` Philippe Mathieu-Daudé
2019-10-01 14:43 ` Stefan Weil
2019-10-01 14:03 ` Alex Bennée
2019-10-01 14:11 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191001132609.23184-2-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).