From patchwork Fri Jun 3 08:49:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 9152313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0E66C6072B for ; Fri, 3 Jun 2016 09:06:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 003122654B for ; Fri, 3 Jun 2016 09:06:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E829C282EE; Fri, 3 Jun 2016 09:06:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA3932654B for ; Fri, 3 Jun 2016 09:06:49 +0000 (UTC) Received: from localhost ([::1]:53499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8l45-00061H-0c for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Jun 2016 05:06:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8kns-0006xi-Ak for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:50:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8knm-0001t7-9j for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:50:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8kne-0001rJ-Ne; Fri, 03 Jun 2016 04:49:50 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EE19846217; Fri, 3 Jun 2016 08:49:49 +0000 (UTC) Received: from ad.usersys.redhat.com (dhcp-15-133.nay.redhat.com [10.66.15.133]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u538nKXq023508; Fri, 3 Jun 2016 04:49:46 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 3 Jun 2016 16:49:00 +0800 Message-Id: <1464943756-14143-7-git-send-email-famz@redhat.com> In-Reply-To: <1464943756-14143-1-git-send-email-famz@redhat.com> References: <1464943756-14143-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 03 Jun 2016 08:49:50 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 06/22] osdep: Introduce qemu_dup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, rjones@redhat.com, John Snow , Jeff Cody , Markus Armbruster , Max Reitz , stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This takes care of both the CLOEXEC flag and fd-path mapping for image locking. Signed-off-by: Fam Zheng --- include/qemu/osdep.h | 3 +++ util/osdep.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 749214a..89c63c7 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -281,6 +281,9 @@ int qemu_madvise(void *addr, size_t len, int advice); int qemu_open(const char *name, int flags, ...); int qemu_close(int fd); int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive); +#ifndef _WIN32 +int qemu_dup(int fd); +#endif int qemu_unlock_fd(int fd, int64_t start, int64_t len); #if defined(__HAIKU__) && defined(__i386__) diff --git a/util/osdep.c b/util/osdep.c index 085ed52..1c87c1e 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -133,6 +133,15 @@ fail: return -1; } +int qemu_dup(int fd) +{ + int r = qemu_dup_flags(fd, 0); + if (r == -1) { + return -errno; + } + return r; +} + static int qemu_parse_fdset(const char *param) { return qemu_parse_fd(param);