From patchwork Tue May 16 19:21:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 9729589 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 7D3206028A for ; Tue, 16 May 2017 19:24:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D8AA2862B for ; Tue, 16 May 2017 19:24:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62648289CE; Tue, 16 May 2017 19:24:18 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E97052862B for ; Tue, 16 May 2017 19:24:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAi2x-0001it-CR; Tue, 16 May 2017 19:22:15 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAi2w-0001iQ-KY for xen-devel@lists.xenproject.org; Tue, 16 May 2017 19:22:14 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id 40/05-03620-6615B195; Tue, 16 May 2017 19:22:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsVybKJssm5qoHS kwZpLEhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bk9f8ZC/7zVrw/f42lgXE+dxcjF4eQQBuT xNf989i7GDk4WAQcJLa0VYOYjAIxEg9+WHcxcgKZYRKTLy9hBbHZBAwl/j7ZxAZiiwDZD7YuZ wUZwyxwk1Hi35OHYAlhAXuJz++es4PYLAKqEtcXbWQFmckr4CqxbhVYWEJATuLksclgMzkF3C ROX/zFBGILCbQySjQsV5/AyLuAkWEVo3pxalFZapGuuV5SUWZ6RkluYmaOrqGBmV5uanFxYnp qTmJSsV5yfu4mRmAgMADBDsaZl/0PMUpyMCmJ8qZVS0UK8SXlp1RmJBZnxBeV5qQWH2KU4eBQ kuBVCJCOFBIsSk1PrUjLzAGGJExagoNHSYT3sD9Qmre4IDG3ODMdInWKUZfj3dIP75mEWPLy8 1KlxHnZQWYIgBRllObBjYDFxyVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ8zKDTOHJzCuB2/ QK6AgmoCPCXoqDHFGSiJCSamDMVFjI2u/QrmOwx7jh7Mt5PmssN73WO3bhx6OX31cl3p8invW juDB3ymq2fJUpH6b9l2O8aeh4ZhfrjKuLL7+pEv10b8eseM8ltyynNSy83GmumraJq2Xr/xXZ dpsmrWhJleB4wFs2W37N1LgXFct28suGHVvaaOnysOYMU+r9H9PtaxY1FjifUmIpzkg01GIuK k4EAPrOYrSKAgAA X-Env-Sender: sstabellini@kernel.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1494962532!62299130!1 X-Originating-IP: [198.145.29.99] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41519 invoked from network); 16 May 2017 19:22:13 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.99) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 May 2017 19:22:13 -0000 Received: from localhost.localdomain (unknown [99.165.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27609239D1; Tue, 16 May 2017 19:21:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27609239D1 From: Stefano Stabellini To: peter.maydell@linaro.org, stefanha@gmail.com Date: Tue, 16 May 2017 12:21:52 -0700 Message-Id: <1494962512-4831-4-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494962512-4831-1-git-send-email-sstabellini@kernel.org> References: <1494962512-4831-1-git-send-email-sstabellini@kernel.org> Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, groug@kaod.org, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org, Eric Blake Subject: [Xen-devel] [PULL 4/4] xen: call qemu_set_cloexec instead of fcntl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the common utility function, which contains checks on return values and first calls F_GETFD as recommended by POSIX.1-2001, instead of manually calling fcntl. CID: 1374831 Signed-off-by: Stefano Stabellini Reviewed-by: Eric Blake Reviewed-by: Greg Kurz CC: anthony.perard@citrix.com CC: groug@kaod.org CC: aneesh.kumar@linux.vnet.ibm.com CC: Eric Blake --- hw/9pfs/xen-9p-backend.c | 2 +- hw/xen/xen_backend.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index a1fdede..5df97c9 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -380,7 +380,7 @@ static int xen_9pfs_connect(struct XenDevice *xendev) if (xen_9pdev->rings[i].evtchndev == NULL) { goto out; } - fcntl(xenevtchn_fd(xen_9pdev->rings[i].evtchndev), F_SETFD, FD_CLOEXEC); + qemu_set_cloexec(xenevtchn_fd(xen_9pdev->rings[i].evtchndev)); xen_9pdev->rings[i].local_port = xenevtchn_bind_interdomain (xen_9pdev->rings[i].evtchndev, xendev->dom, diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index c85f163..2cac47d 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -147,7 +147,7 @@ static struct XenDevice *xen_be_get_xendev(const char *type, int dom, int dev, qdev_unplug(DEVICE(xendev), NULL); return NULL; } - fcntl(xenevtchn_fd(xendev->evtchndev), F_SETFD, FD_CLOEXEC); + qemu_set_cloexec(xenevtchn_fd(xendev->evtchndev)); if (ops->flags & DEVOPS_FLAG_NEED_GNTDEV) { xendev->gnttabdev = xengnttab_open(NULL, 0);