From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFd7M-0007yX-H2 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 04:02:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFd7L-0006tg-OD for qemu-devel@nongnu.org; Wed, 22 Jun 2016 04:02:36 -0400 From: Fam Zheng Date: Wed, 22 Jun 2016 16:02:10 +0800 Message-Id: <20160622080211.7126-2-famz@redhat.com> In-Reply-To: <20160622080211.7126-1-famz@redhat.com> References: <20160622080211.7126-1-famz@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] osdep: Introduce qemu_dup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , qemu-block@nongnu.org And use it in qemu_dup_flags. Signed-off-by: Fam Zheng --- include/qemu/osdep.h | 3 +++ util/osdep.c | 23 +++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index e63da28..7361006 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -278,6 +278,9 @@ int qemu_madvise(void *addr, size_t len, int advice); int qemu_open(const char *name, int flags, ...); int qemu_close(int fd); +#ifndef _WIN32 +int qemu_dup(int fd); +#endif #if defined(__HAIKU__) && defined(__i386__) #define FMT_pid "%ld" diff --git a/util/osdep.c b/util/osdep.c index ff004e8..c746e9f 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -83,14 +83,7 @@ static int qemu_dup_flags(int fd, int flags) int serrno; int dup_flags; -#ifdef F_DUPFD_CLOEXEC - ret = fcntl(fd, F_DUPFD_CLOEXEC, 0); -#else - ret = dup(fd); - if (ret != -1) { - qemu_set_cloexec(ret); - } -#endif + ret = qemu_dup(fd); if (ret == -1) { goto fail; } @@ -129,6 +122,20 @@ fail: return -1; } +int qemu_dup(int fd) +{ + int r; +#ifdef F_DUPFD_CLOEXEC + r = fcntl(fd, F_DUPFD_CLOEXEC, 0); +#else + r = dup(fd); + if (r != -1) { + qemu_set_cloexec(raw_s->fd); + } +#endif + return r; +} + static int qemu_parse_fdset(const char *param) { return qemu_parse_fd(param); -- 2.9.0