From: Luiz Capitulino <lcapitulino@redhat.com>
To: mdroth@linux.vnet.ibm.com
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 1/2] qemu-ga: make reopen_fd_to_null() public
Date: Thu, 10 May 2012 16:50:41 -0300 [thread overview]
Message-ID: <1336679442-19198-2-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1336679442-19198-1-git-send-email-lcapitulino@redhat.com>
The next commit wants to use it.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
qemu-ga.c | 17 +++++++++++++++++
qga/commands-posix.c | 19 -------------------
qga/guest-agent-core.h | 4 ++++
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/qemu-ga.c b/qemu-ga.c
index 216be39..7896565 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 d58730a..2ce9b82 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 bbb8b9b..6dba104 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
--
1.7.9.2.384.g4a92a
next prev parent reply other threads:[~2012-05-10 19:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 19:50 [Qemu-devel] [PATCH 0/2]: qemu-ga: Fix fd handling in daemon mode Luiz Capitulino
2012-05-10 19:50 ` Luiz Capitulino [this message]
2012-05-10 20:14 ` [Qemu-devel] [PATCH 1/2] qemu-ga: make reopen_fd_to_null() public Eric Blake
2012-05-10 19:50 ` [Qemu-devel] [PATCH 2/2] qemu-ga: become_daemon(): reopen standard fds to /dev/null Luiz Capitulino
2012-05-10 20:11 ` Eric Blake
2012-05-11 22:02 ` [Qemu-devel] [PATCH 0/2]: qemu-ga: Fix fd handling in daemon mode Michael Roth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336679442-19198-2-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).