From patchwork Fri Apr 15 17:45:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 8853891 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A37A09F3A0 for ; Fri, 15 Apr 2016 17:45:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 162B220211 for ; Fri, 15 Apr 2016 17:45:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2213220204 for ; Fri, 15 Apr 2016 17:45:55 +0000 (UTC) Received: from localhost ([::1]:38783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar7oY-0007Y6-Au for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Apr 2016 13:45:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar7oG-0007OH-Nq for qemu-devel@nongnu.org; Fri, 15 Apr 2016 13:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar7oF-0002xU-EP for qemu-devel@nongnu.org; Fri, 15 Apr 2016 13:45:36 -0400 Received: from qemu.weilnetz.de ([37.221.198.45]:56208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar7oE-0002x9-Ry for qemu-devel@nongnu.org; Fri, 15 Apr 2016 13:45:35 -0400 Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 2954317F6D6; Fri, 15 Apr 2016 19:45:32 +0200 (CEST) From: Stefan Weil To: QEMU Developer Date: Fri, 15 Apr 2016 19:45:01 +0200 Message-Id: <1460742301-13089-2-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1460742301-13089-1-git-send-email-sw@weilnetz.de> References: <1460742301-13089-1-git-send-email-sw@weilnetz.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 37.221.198.45 Subject: [Qemu-devel] [PULL 1/1] wxx: Fix broken TCP networking (regression) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Weil Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is broken since commit c619644067f98098dcdbc951e2dda79e97560afa. Reported-by: Michael Fritscher Tested-by: Michael Fritscher Reviewed-by: Peter Maydell Reviewed-by: Daniel P. Berrange Signed-off-by: Stefan Weil --- 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;