From patchwork Thu Apr 14 11:49:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil <1569988@bugs.launchpad.net> X-Patchwork-Id: 610426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3qlzf108TRz9sC4 for ; Thu, 14 Apr 2016 21:56:09 +1000 (AEST) Received: from localhost ([::1]:38165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqfsV-0002lr-4q for incoming@patchwork.ozlabs.org; Thu, 14 Apr 2016 07:56:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqfsA-00027m-P0 for qemu-devel@nongnu.org; Thu, 14 Apr 2016 07:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqfs7-0001gm-J1 for qemu-devel@nongnu.org; Thu, 14 Apr 2016 07:55:46 -0400 Received: from indium.canonical.com ([91.189.90.7]:41718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqfs7-0001gf-D2 for qemu-devel@nongnu.org; Thu, 14 Apr 2016 07:55:43 -0400 Received: from loganberry.canonical.com ([91.189.90.37]) by indium.canonical.com with esmtp (Exim 4.76 #1 (Debian)) id 1aqfs6-0001um-5z for ; Thu, 14 Apr 2016 11:55:42 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id AB0CB2E80CD for ; Thu, 14 Apr 2016 11:55:41 +0000 (UTC) MIME-Version: 1.0 Date: Thu, 14 Apr 2016 11:49:00 -0000 From: Stefan Weil <1569988@bugs.launchpad.net> To: qemu-devel@nongnu.org X-Launchpad-Notification-Type: bug X-Launchpad-Bug: product=qemu; status=New; importance=Undecided; assignee=None; X-Launchpad-Bug-Tags: dev network windows X-Launchpad-Bug-Information-Type: Public X-Launchpad-Bug-Private: no X-Launchpad-Bug-Security-Vulnerability: no X-Launchpad-Bug-Commenters: 3-ueuntu-4 ubuntu-weilnetz X-Launchpad-Bug-Reporter: Michael (3-ueuntu-4) X-Launchpad-Bug-Modifier: Stefan Weil (ubuntu-weilnetz) References: <20160413160542.31798.50939.malonedeb@soybean.canonical.com> Message-Id: <20160414114900.4201.81003.malone@gac.canonical.com> X-Launchpad-Message-Rationale: Subscriber (QEMU) @qemu-devel-ml X-Launchpad-Message-For: qemu-devel-ml Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="17990"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 13e88e0112664d61b45f9a2a4e40208b351812c0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 91.189.90.7 Subject: [Qemu-devel] [Bug 1569988] Re: [2.6] user network broken reaching foreign servers on Win64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Bug 1569988 <1569988@bugs.launchpad.net> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Here is a patch which fixes the problem. diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 2027a75..696867f 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -587,7 +587,7 @@ findso: if ((tcp_fconnect(so, so->so_ffamily) == -1) && #if defined(_WIN32) - socket_error() != WSAEWOULDBLOCK + socket_error() != EAGAIN #else (errno != EINPROGRESS) && (errno != EWOULDBLOCK) #endif Latest QEMU needs a slightly different patch: diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 5433e7f..3be2d2f 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -659,6 +659,7 @@ findso: } if ((tcp_fconnect(so, so->so_ffamily) == -1) && + socket_error() != EAGAIN && (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) { uint8_t code;