diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-14 11:49:32 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-14 11:49:33 +0000 |
| commit | 8326ec2c834f7debbba0ed80a433c3ae0cf48289 (patch) | |
| tree | 34922bf42bc909af00680d7e3269d8b765f39f1f /slirp/tcp_input.c | |
| parent | d1ab9681ac54a01aece0f17f082a7f8677311f51 (diff) | |
| parent | b16a44e13e89ee397a3d9a9e3cfa1605c3c1dc68 (diff) | |
| download | qemu-8326ec2c834f7debbba0ed80a433c3ae0cf48289.zip qemu-8326ec2c834f7debbba0ed80a433c3ae0cf48289.tar.gz qemu-8326ec2c834f7debbba0ed80a433c3ae0cf48289.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-win32-2016-03-11-1' into staging
Merge I/O fixes for win32
# gpg: Signature made Fri 11 Mar 2016 10:03:20 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-io-win32-2016-03-11-1:
osdep: remove use of socket_error() from all code
osdep: add wrappers for socket functions
char: remove qemu_chr_open_socket_fd method
char: remove socket_try_connect method
char: remove qemu_chr_finish_socket_connection method
io: implement socket watch for win32 using WSAEventSelect+select
io: remove checking of EWOULDBLOCK
io: use qemu_accept to ensure SOCK_CLOEXEC is set
io: introduce qio_channel_create_socket_watch
io: pass HANDLE to g_source_add_poll on Win32
io: fix copy+paste mistake in socket error message
io: assert errors before asserting content in I/O test
io: set correct error object in background reader test thread
io: wait for incoming client in socket test
io: bind to socket before creating QIOChannelSocket
io: initialize sockets in test program
io: use bind() to check for IPv4/6 availability
osdep: fix socket_error() to work with Mingw64
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/tcp_input.c')
| -rw-r--r-- | slirp/tcp_input.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 2027a75..03be56e 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -586,11 +586,7 @@ findso: } if ((tcp_fconnect(so, so->so_ffamily) == -1) && -#if defined(_WIN32) - socket_error() != WSAEWOULDBLOCK -#else (errno != EINPROGRESS) && (errno != EWOULDBLOCK) -#endif ) { u_char code=ICMP_UNREACH_NET; DEBUG_MISC((dfd, " tcp fconnect errno = %d-%s\n", |