Message ID | 20190114000326.29847-47-samuel.thibault@ens-lyon.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43dFDM4Qg1z9s7h for <incoming@patchwork.ozlabs.org>; Mon, 14 Jan 2019 11:47:15 +1100 (AEDT) Received: from localhost ([127.0.0.1]:47782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1giqPJ-0001Pv-AL for incoming@patchwork.ozlabs.org; Sun, 13 Jan 2019 19:47:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gipka-0003Ku-BF for qemu-devel@nongnu.org; Sun, 13 Jan 2019 19:05:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gipkZ-0006k6-JJ for qemu-devel@nongnu.org; Sun, 13 Jan 2019 19:05:08 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:57494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gipkZ-0006Z3-CN for qemu-devel@nongnu.org; Sun, 13 Jan 2019 19:05:07 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0A8991B8B; Mon, 14 Jan 2019 01:04:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sMfZQJhG3V09; Mon, 14 Jan 2019 01:04:36 +0100 (CET) Received: from function.home (lfbn-1-11161-124.w86-213.abo.wanadoo.fr [86.213.235.124]) by hera.aquilenet.fr (Postfix) with ESMTPSA id F1DC51BC0; Mon, 14 Jan 2019 01:04:09 +0100 (CET) Received: from samy by function.home with local (Exim 4.92-RC4) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gipja-0007p5-VE; Mon, 14 Jan 2019 01:04:06 +0100 From: Samuel Thibault <samuel.thibault@ens-lyon.org> To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 01:03:07 +0100 Message-Id: <20190114000326.29847-47-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114000326.29847-1-samuel.thibault@ens-lyon.org> References: <20190114000326.29847-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULL 46/65] slirp: Enable fork_exec support on Windows X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>, =?utf-8?q?Marc-Andr?= =?utf-8?b?w6kgTHVyZWF1?= <marcandre.lureau@redhat.com>, stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/65] slirp: associate slirp_output callback with the Slirp context
|
expand
|
diff --git a/slirp/misc.c b/slirp/misc.c index b141446319..2d092624d3 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -62,17 +62,6 @@ int add_exec(struct ex_list **ex_ptr, void *chardev, const char *cmdline, } -#ifdef _WIN32 - -int -fork_exec(struct socket *so, const char *ex) -{ - /* not implemented */ - return 0; -} - -#else - static int slirp_socketpair_with_oob(int sv[2]) { @@ -132,7 +121,9 @@ err: static void fork_exec_child_setup(gpointer data) { +#ifndef _WIN32 setsid(); +#endif } int @@ -177,7 +168,6 @@ fork_exec(struct socket *so, const char *ex) qemu_set_nonblock(so->s); return 1; } -#endif char *slirp_connection_info(Slirp *slirp) {