[Qemu-devel] [PULL 1/1] wxx: Fix broken TCP networking (regression)

[Stefan Weil]

It is broken since commit c619644067f98098dcdbc951e2dda79e97560afa.

Reported-by: Michael Fritscher <address@hidden>
Tested-by: Michael Fritscher <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
---
 slirp/slirp.h     | 5 -----
 slirp/tcp_input.c | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/slirp/slirp.h b/slirp/slirp.h
index c99ebb9..203deec 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -347,9 +347,4 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err);
 #define max(x,y) ((x) > (y) ? (x) : (y))
 #endif
 
-#ifdef _WIN32
-#undef errno
-#define errno (WSAGetLastError())
-#endif
-
 #endif
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index 5433e7f..e2b5d4e 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -659,6 +659,7 @@ findso:
          }
 
          if ((tcp_fconnect(so, so->so_ffamily) == -1) &&
+              (errno != EAGAIN) &&
               (errno != EINPROGRESS) && (errno != EWOULDBLOCK)
           ) {
            uint8_t code;
-- 
2.1.4