From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 19 Nov 2018 22:57:39 +0000 (+0100)
Subject: slirp: Enable fork_exec support on Windows
X-Git-Tag: v4.0.0-rc0~163^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e589a4423fad1c4a03d7b589b2c24709e07cea4a;p=thirdparty%2Fqemu.git

slirp: Enable fork_exec support on Windows

g_spawn_async_with_fds is portable on Windows, so we can now enable
fork_exec support there.

Thanks Daniel P. Berrangé for the notice!

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/slirp/misc.c b/slirp/misc.c
index b141446319d..2d092624d35 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)
 {