From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFd7K-0007w3-7q for qemu-devel@nongnu.org; Wed, 22 Jun 2016 04:02:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFd7I-0006sn-9W for qemu-devel@nongnu.org; Wed, 22 Jun 2016 04:02:33 -0400 From: Fam Zheng Date: Wed, 22 Jun 2016 16:02:11 +0800 Message-Id: <20160622080211.7126-3-famz@redhat.com> In-Reply-To: <20160622080211.7126-1-famz@redhat.com> References: <20160622080211.7126-1-famz@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] raw-posix: Use 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 Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- block/raw-posix.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index bef7a67..c8ef64b 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -639,15 +639,7 @@ static int raw_reopen_prepare(BDRVReopenState *state, if ((raw_s->open_flags & ~fcntl_flags) == (s->open_flags & ~fcntl_flags)) { /* dup the original fd */ - /* TODO: use qemu fcntl wrapper */ -#ifdef F_DUPFD_CLOEXEC - raw_s->fd = fcntl(s->fd, F_DUPFD_CLOEXEC, 0); -#else - raw_s->fd = dup(s->fd); - if (raw_s->fd != -1) { - qemu_set_cloexec(raw_s->fd); - } -#endif + raw_s->fd = qemu_dup(s->fd); if (raw_s->fd >= 0) { ret = fcntl_setfl(raw_s->fd, raw_s->open_flags); if (ret) { -- 2.9.0