From patchwork Thu Apr 28 12:57:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8969841 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E8DF4BF29F for ; Thu, 28 Apr 2016 13:04:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F861202EB for ; Thu, 28 Apr 2016 13:04:31 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id AD7E6202D1 for ; Thu, 28 Apr 2016 13:04:30 +0000 (UTC) Received: from localhost ([::1]:48798 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avlcM-0006BU-0C for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Apr 2016 09:04:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avlWZ-0001uP-Is for qemu-devel@nongnu.org; Thu, 28 Apr 2016 08:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avlWV-0000Mo-Le for qemu-devel@nongnu.org; Thu, 28 Apr 2016 08:58:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avlWT-0000M7-LR; Thu, 28 Apr 2016 08:58:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 396503B9; Thu, 28 Apr 2016 12:58:25 +0000 (UTC) Received: from lemon.redhat.com (vpn1-5-154.pek2.redhat.com [10.72.5.154]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3SCvWNC001193; Thu, 28 Apr 2016 08:58:20 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2016 20:57:28 +0800 Message-Id: <1461848266-32119-10-git-send-email-famz@redhat.com> In-Reply-To: <1461848266-32119-1-git-send-email-famz@redhat.com> References: <1461848266-32119-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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 v3 09/27] 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, Jeff Cody , Markus Armbruster , Max Reitz , stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com, John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This takes care both the CLOEXEC flag and fd-path mapping for image locking. Signed-off-by: Fam Zheng --- include/qemu/osdep.h | 1 + util/osdep.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 089c13f..8174902 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -251,6 +251,7 @@ 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_dup(int fd); int qemu_lock_fd(int fd, int64_t start, int64_t len, bool readonly); int qemu_unlock_fd(int fd, int64_t start, int64_t len); diff --git a/util/osdep.c b/util/osdep.c index 1510cbf..66c993a 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -408,6 +408,21 @@ int qemu_close(int fd) return qemu_fd_close(fd); } +int qemu_dup(int fd) +{ + char *path; + int ret = qemu_dup_flags(fd, 0); + if (ret == -1) { + return ret; + } + + path = g_hash_table_lookup(fd_to_path, GINT_TO_POINTER(fd)); + assert(path); + qemu_fd_add_record(ret, path); + return ret; +} + + /* * A variant of write(2) which handles partial write. *