From: Kevin Wolf <kwolf@redhat.com>
To: Fam Zheng <famz@redhat.com>
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
qemu-block@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 1/2] osdep: Introduce qemu_dup
Date: Wed, 22 Jun 2016 14:27:45 +0200 [thread overview]
Message-ID: <20160622122745.GE6134@noname.redhat.com> (raw)
In-Reply-To: <20160622080211.7126-2-famz@redhat.com>
Am 22.06.2016 um 10:02 hat Fam Zheng geschrieben:
> And use it in qemu_dup_flags.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> 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;
Why the rename? (Not necessarily objecting, just curious.)
> +#ifdef F_DUPFD_CLOEXEC
> + r = fcntl(fd, F_DUPFD_CLOEXEC, 0);
> +#else
> + r = dup(fd);
> + if (r != -1) {
> + qemu_set_cloexec(raw_s->fd);
This won't compile.
Kevin
next prev parent reply other threads:[~2016-06-22 12:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 8:02 [Qemu-devel] [PATCH 0/2] block: Add qemu_dup in osdep.c and use it Fam Zheng
2016-06-22 8:02 ` [Qemu-devel] [PATCH 1/2] osdep: Introduce qemu_dup Fam Zheng
2016-06-22 12:27 ` Kevin Wolf [this message]
2016-06-22 12:38 ` Fam Zheng
2016-06-22 15:18 ` Eric Blake
2016-06-22 8:02 ` [Qemu-devel] [PATCH 2/2] raw-posix: Use qemu_dup Fam Zheng
2016-06-22 12:28 ` Kevin Wolf
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=20160622122745.GE6134@noname.redhat.com \
--to=kwolf@redhat.com \
--cc=famz@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--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).