diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2012-05-10 16:50:41 -0300 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-05-15 09:15:16 -0500 |
| commit | 04b4e75f33ae0775d70b8e33080f46d66275cdcc (patch) | |
| tree | d6ec33bf787cc012c9f85c6cdd07ac83f1ad6c44 | |
| parent | d9fcd2a1c825791cec9b21e634013b728422972f (diff) | |
| download | focaccia-qemu-04b4e75f33ae0775d70b8e33080f46d66275cdcc.tar.gz focaccia-qemu-04b4e75f33ae0775d70b8e33080f46d66275cdcc.zip | |
qemu-ga: make reopen_fd_to_null() public
The next commit wants to use it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qemu-ga.c | 17 | ||||
| -rw-r--r-- | qga/commands-posix.c | 19 | ||||
| -rw-r--r-- | qga/guest-agent-core.h | 4 |
3 files changed, 21 insertions, 19 deletions
diff --git a/qemu-ga.c b/qemu-ga.c index cf61cb95e5..8d53e04a0f 100644 --- a/qemu-ga.c +++ b/qemu-ga.c @@ -140,6 +140,23 @@ static gboolean register_signal_handlers(void) return true; } + +/* TODO: use this in place of all post-fork() fclose(std*) callers */ +void reopen_fd_to_null(int fd) +{ + int nullfd; + + nullfd = open("/dev/null", O_RDWR); + if (nullfd < 0) { + return; + } + + dup2(nullfd, fd); + + if (nullfd != fd) { + close(nullfd); + } +} #endif static void usage(const char *cmd) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index e448431c66..adb9b3db8d 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -34,25 +34,6 @@ #endif #endif -#if defined(__linux__) -/* TODO: use this in place of all post-fork() fclose(std*) callers */ -static void reopen_fd_to_null(int fd) -{ - int nullfd; - - nullfd = open("/dev/null", O_RDWR); - if (nullfd < 0) { - return; - } - - dup2(nullfd, fd); - - if (nullfd != fd) { - close(nullfd); - } -} -#endif /* defined(__linux__) */ - void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err) { int ret; diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index bbb8b9b125..6dba10484d 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -35,3 +35,7 @@ void ga_set_response_delimited(GAState *s); bool ga_is_frozen(GAState *s); void ga_set_frozen(GAState *s); void ga_unset_frozen(GAState *s); + +#ifndef _WIN32 +void reopen_fd_to_null(int fd); +#endif |