From: Jes.Sorensen@redhat.com
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 3/9] qemu_pipe() is used only by POSIX code, so move to os-posix-lib.c
Date: Fri, 15 Oct 2010 16:05:47 +0200 [thread overview]
Message-ID: <1287151553-16894-4-git-send-email-Jes.Sorensen@redhat.com> (raw)
In-Reply-To: <1287151553-16894-1-git-send-email-Jes.Sorensen@redhat.com>
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
os-posix-lib.c | 22 ++++++++++++++++++++++
osdep.c | 22 ----------------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/os-posix-lib.c b/os-posix-lib.c
index 79f9bac..773e998 100644
--- a/os-posix-lib.c
+++ b/os-posix-lib.c
@@ -78,3 +78,25 @@ void qemu_set_cloexec(int fd)
f = fcntl(fd, F_GETFD);
fcntl(fd, F_SETFD, f | FD_CLOEXEC);
}
+
+/*
+ * Creates a pipe with FD_CLOEXEC set on both file descriptors
+ */
+int qemu_pipe(int pipefd[2])
+{
+ int ret;
+
+#ifdef CONFIG_PIPE2
+ ret = pipe2(pipefd, O_CLOEXEC);
+ if (ret != -1 || errno != ENOSYS) {
+ return ret;
+ }
+#endif
+ ret = pipe(pipefd);
+ if (ret == 0) {
+ qemu_set_cloexec(pipefd[0]);
+ qemu_set_cloexec(pipefd[1]);
+ }
+
+ return ret;
+}
diff --git a/osdep.c b/osdep.c
index bc95bdd..0019238 100644
--- a/osdep.c
+++ b/osdep.c
@@ -250,28 +250,6 @@ int qemu_eventfd(int fds[2])
return qemu_pipe(fds);
}
-
-/*
- * Creates a pipe with FD_CLOEXEC set on both file descriptors
- */
-int qemu_pipe(int pipefd[2])
-{
- int ret;
-
-#ifdef CONFIG_PIPE2
- ret = pipe2(pipefd, O_CLOEXEC);
- if (ret != -1 || errno != ENOSYS) {
- return ret;
- }
-#endif
- ret = pipe(pipefd);
- if (ret == 0) {
- qemu_set_cloexec(pipefd[0]);
- qemu_set_cloexec(pipefd[1]);
- }
-
- return ret;
-}
#endif
/*
--
1.7.2.3
next prev parent reply other threads:[~2010-10-15 14:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-15 14:05 [Qemu-devel] [PATCH 0/9] Re-factor osdep code + macro and brace fixes Jes.Sorensen
2010-10-15 14:05 ` [Qemu-devel] [PATCH 1/9] Move QEMU OS dependant library functions to OS specific files Jes.Sorensen
2010-10-15 20:07 ` Blue Swirl
2010-10-15 14:05 ` [Qemu-devel] [PATCH 2/9] Move osdep socket code to os-{posix, win32}-lib.c Jes.Sorensen
2010-10-15 14:05 ` Jes.Sorensen [this message]
2010-10-15 14:05 ` [Qemu-devel] [PATCH 4/9] We only support eventfd under POSIX, move qemu_eventfd() to os-posix.c Jes.Sorensen
2010-10-15 14:05 ` [Qemu-devel] [PATCH 5/9] Move qemu_gettimeofday() to OS specific files Jes.Sorensen
2010-10-15 16:39 ` [Qemu-devel] " Paolo Bonzini
2010-10-16 14:27 ` Jes Sorensen
2010-10-15 14:05 ` [Qemu-devel] [PATCH 6/9] Do not redefine reserved key-words TRUE/FALSE Jes.Sorensen
2010-10-15 14:05 ` [Qemu-devel] [PATCH 7/9] Separate qemu_pidfile() into OS specific versions Jes.Sorensen
2010-10-15 14:05 ` [Qemu-devel] [PATCH 8/9] Consolidate oom_check() functions Jes.Sorensen
2010-10-15 14:05 ` [Qemu-devel] [PATCH 9/9] Remove unncessary includes Jes.Sorensen
2010-10-15 16:41 ` [Qemu-devel] Re: [PATCH 0/9] Re-factor osdep code + macro and brace fixes Paolo Bonzini
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=1287151553-16894-4-git-send-email-Jes.Sorensen@redhat.com \
--to=jes.sorensen@redhat.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).