[v2,for-3.2,v2,04/30] slirp: simplify fork_exec()

Message ID	20181121220647.18844-5-marcandre.lureau@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 22 Nov 2018 02:06:21 +0400 Message-Id: <20181121220647.18844-5-marcandre.lureau@redhat.com> In-Reply-To: <20181121220647.18844-1-marcandre.lureau@redhat.com> References: <20181121220647.18844-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 for-3.2 v2 04/30] slirp: simplify fork_exec() Precedence: list Cc: Li Zhijian <lizhijian@cn.fujitsu.com>, Jan Kiszka <jan.kiszka@siemens.com>, Jason Wang <jasowang@redhat.com>, Zhang Chen <zhangckid@gmail.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.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	slirp: make it again a standalone project \| expand [v2,for-3.2,v2,00/30] slirp: make it again a standalone project [v2,for-3.2,v2,01/30] fixup! net: do not depend on slirp internals [v2,for-3.2,v2,02/30] slirp: drop <Vista compatibility [v2,for-3.2,v2,03/30] glib-compat: add g_spawn_async_with_fds() fallback [v2,for-3.2,v2,04/30] slirp: simplify fork_exec() [v2,for-3.2,v2,05/30] slirp: rename exec_list [v2,for-3.2,v2,06/30] slirp: factor out guestfwd addition checks [v2,for-3.2,v2,07/30] slirp: generalize guestfwd with a callback based approach [v2,for-3.2,v2,08/30] net/slirp: simplify checking for cmd: prefix [v2,for-3.2,v2,09/30] net/slirp: fix a few memory leaks [v2,for-3.2,v2,10/30] slirp: use virtual time for packet expiration [v2,for-3.2,v2,11/30] slirp: add clock_get_ns() callback [v2,for-3.2,v2,12/30] slirp: add callbacks for timer [v2,for-3.2,v2,13/30] build-sys: use a seperate slirp-obj-y && slirp.mo [v2,for-3.2,v2,14/30] slirp: set G_LOG_DOMAIN [v2,for-3.2,v2,15/30] slirp: replace error_report() and a fprintf with g_critical() [v2,for-3.2,v2,16/30] slirp: replace some fprintf() with DEBUG_MISC [v2,for-3.2,v2,17/30] slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG [v2,for-3.2,v2,18/30] slirp: no need to make DPRINTF conditional on DEBUG [v2,for-3.2,v2,19/30] slirp: always build with debug statements [v2,for-3.2,v2,20/30] slirp: introduce SLIRP_DEBUG environment variable [v2,for-3.2,v2,21/30] slirp: use %p for pointers format [v2,for-3.2,v2,22/30] slirp: remove remaining DEBUG blocks [v2,for-3.2,v2,23/30] slirp: replace DEBUG_ARGS with DEBUG_ARG [v2,for-3.2,v2,24/30] slirp: call into g_debug() for DEBUG macros [v2,for-3.2,v2,25/30] slirp: replace trace functions with DEBUG calls [v2,for-3.2,v2,26/30] slirp: add a set_nonblock() callback [v2,for-3.2,v2,27/30] slirp: replace qemu_notify_event() with a callback [v2,for-3.2,v2,28/30] slirp: move QEMU state saving to a separate unit [v2,for-3.2,v2,29/30] slirp: replace remaining QEMU dependency [v2,for-3.2,v2,30/30] build-sys: add a basic meson build

Message ID

20181121220647.18844-5-marcandre.lureau@redhat.com

State

New

Headers

From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Date: Thu, 22 Nov 2018 02:06:21 +0400
Message-Id: <20181121220647.18844-5-marcandre.lureau@redhat.com>
In-Reply-To: <20181121220647.18844-1-marcandre.lureau@redhat.com>
References: <20181121220647.18844-1-marcandre.lureau@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PATCH v2 for-3.2 v2 04/30] slirp: simplify fork_exec()
Precedence: list
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>,
	Jan Kiszka <jan.kiszka@siemens.com>, Jason Wang <jasowang@redhat.com>,
	Zhang Chen <zhangckid@gmail.com>, Samuel Thibault
	<samuel.thibault@ens-lyon.org>, =?utf-8?q?Marc-Andr=C3=A9_Lureau?=
	<marcandre.lureau@redhat.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

slirp: make it again a standalone project | expand

Commit Message

Marc-André Lureau Nov. 21, 2018, 10:06 p.m. UTC

Use g_spawn_async_with_fds() to setup the child.

GSpawn handles reaping the child, and closing parent file descriptors.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 slirp/misc.c | 75 +++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

Comments

Samuel Thibault Nov. 21, 2018, 10:16 p.m. UTC | #1

Marc-André Lureau, le jeu. 22 nov. 2018 02:06:21 +0400, a ecrit:
> Use g_spawn_async_with_fds() to setup the child.
> 
> GSpawn handles reaping the child, and closing parent file descriptors.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Ditto.

Samuel

diff --git a/slirp/misc.c b/slirp/misc.c
index ee3492a2ae..753b3da25b 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -129,56 +129,53 @@  err:
     return -1;
 }
 
+static void
+fork_exec_child_setup(gpointer data)
+{
+    setsid();
+}
+
 int
 fork_exec(struct socket *so, const char *ex)
 {
-	char **argv;
-	int opt, c, sp[2];
-	pid_t pid;
+    GError *err = NULL;
+    char **argv;
+    int opt, sp[2];
 
-	DEBUG_CALL("fork_exec");
-	DEBUG_ARG("so = %p", so);
-	DEBUG_ARG("ex = %p", ex);
+    DEBUG_CALL("fork_exec");
+    DEBUG_ARG("so = %p", so);
+    DEBUG_ARG("ex = %p", ex);
 
     if (slirp_socketpair_with_oob(sp) < 0) {
         return 0;
     }
 
-	pid = fork();
-	switch(pid) {
-	 case -1:
-		error_report("Error: fork failed: %s", strerror(errno));
-		closesocket(sp[0]);
-		closesocket(sp[1]);
-		return 0;
-
-	 case 0:
-		setsid();
-		dup2(sp[1], 0);
-		dup2(sp[1], 1);
-		dup2(sp[1], 2);
-		for (c = getdtablesize() - 1; c >= 3; c--)
-		   close(c);
+    argv = g_strsplit(ex, " ", -1);
+    g_spawn_async_with_fds(NULL /* cwd */,
+                           argv,
+                           NULL /* env */,
+                           G_SPAWN_SEARCH_PATH,
+                           fork_exec_child_setup, NULL /* data */,
+                           NULL /* child_pid */,
+                           sp[1], sp[1], sp[1],
+                           &err);
+    g_strfreev(argv);
 
-                argv = g_strsplit(ex, " ", -1);
-		execvp(argv[0], (char **)argv);
-
-		/* Ooops, failed, let's tell the user why */
-        fprintf(stderr, "Error: execvp of %s failed: %s\n",
-                argv[0], strerror(errno));
-		close(0); close(1); close(2); /* XXX */
-		exit(1);
+    if (err) {
+        error_report("%s", err->message);
+        g_error_free(err);
+        closesocket(sp[0]);
+        closesocket(sp[1]);
+        return 0;
+    }
 
-	 default:
-		so->s = sp[0];
-		closesocket(sp[1]);
-		qemu_add_child_watch(pid);
-		socket_set_fast_reuse(so->s);
-		opt = 1;
-		qemu_setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
-		qemu_set_nonblock(so->s);
-		return 1;
-	}
+    so->s = sp[0];
+    closesocket(sp[1]);
+    socket_set_fast_reuse(so->s);
+    opt = 1;
+    qemu_setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
+    qemu_set_nonblock(so->s);
+    return 1;
 }
 #endif

[v2,for-3.2,v2,04/30] slirp: simplify fork_exec()

Commit Message

Comments

Patch