aboutsummaryrefslogtreecommitdiff
path: root/slirp/misc.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-03-09 18:21:10 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-03-29 08:14:11 -0500
commit4d54ec7898bd951007cb6122d5315584bd41d0c4 (patch)
treee96c20c18a4ef32efe87295a70d17316757832cb /slirp/misc.c
parent0298141998ea3e19fd86b5a7122aab2fd1ebad51 (diff)
downloadqemu-arm-4d54ec7898bd951007cb6122d5315584bd41d0c4.tar.gz
add a service to reap zombies, use it in SLIRP
SLIRP -smb support wants to fork a process and forget about reaping it. To please it, add a generic service to register a process id and let QEMU reap it. In the future it could be enhanced to pass a status, but this would be unused. With this in place, the SIGCHLD signal handler would not stomp on pclose anymore. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/misc.c')
-rw-r--r--slirp/misc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/slirp/misc.c b/slirp/misc.c
index 19dbec491f..08eba6adc0 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -119,6 +119,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
char *bptr;
const char *curarg;
int c, i, ret;
+ pid_t pid;
DEBUG_CALL("fork_exec");
DEBUG_ARG("so = %lx", (long)so);
@@ -142,7 +143,8 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
}
}
- switch(fork()) {
+ pid = fork();
+ switch(pid) {
case -1:
lprint("Error: fork failed: %s\n", strerror(errno));
close(s);
@@ -206,6 +208,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
exit(1);
default:
+ qemu_add_child_watch(pid);
if (do_pty == 2) {
close(s);
so->s = master;