aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-11-19 23:57:39 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2019-01-14 00:44:29 +0100
commite589a4423fad1c4a03d7b589b2c24709e07cea4a (patch)
tree17e37e768c0dfa4777e894360095fa6f8cb2ee3f /slirp
parent6b744ea42a4ef8062c5be269c4554328c4ed7c40 (diff)
downloadqemu-e589a4423fad1c4a03d7b589b2c24709e07cea4a.zip
qemu-e589a4423fad1c4a03d7b589b2c24709e07cea4a.tar.gz
qemu-e589a4423fad1c4a03d7b589b2c24709e07cea4a.tar.bz2
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>
Diffstat (limited to 'slirp')
-rw-r--r--slirp/misc.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/slirp/misc.c b/slirp/misc.c
index b141446..2d09262 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)
{