From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8ART-0001gk-HM for qemu-devel@nongnu.org; Tue, 09 May 2017 15:05:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8ARR-0001EG-Io for qemu-devel@nongnu.org; Tue, 09 May 2017 15:05:03 -0400 Received: from mail.kernel.org ([198.145.29.136]:43480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d8ARR-0001Dk-Db for qemu-devel@nongnu.org; Tue, 09 May 2017 15:05:01 -0400 From: Stefano Stabellini Date: Tue, 9 May 2017 12:04:53 -0700 Message-Id: <1494356693-13190-3-git-send-email-sstabellini@kernel.org> In-Reply-To: <1494356693-13190-1-git-send-email-sstabellini@kernel.org> References: <1494356693-13190-1-git-send-email-sstabellini@kernel.org> Subject: [Qemu-devel] [PATCH v2 3/3] xen: call qemu_set_cloexec instead of fcntl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xen.org, sstabellini@kernel.org, anthony.perard@citrix.com, groug@kaod.org, aneesh.kumar@linux.vnet.ibm.com, Eric Blake Use the common utility function, which contains checks on return values, instead of manually calling fcntl. CID: 1374831 Signed-off-by: Stefano Stabellini 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); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v2 3/3] xen: call qemu_set_cloexec instead of fcntl Date: Tue, 9 May 2017 12:04:53 -0700 Message-ID: <1494356693-13190-3-git-send-email-sstabellini@kernel.org> References: <1494356693-13190-1-git-send-email-sstabellini@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1494356693-13190-1-git-send-email-sstabellini@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, groug@kaod.org, xen-devel@lists.xen.org, aneesh.kumar@linux.vnet.ibm.com, anthony.perard@citrix.com, Eric Blake List-Id: xen-devel@lists.xenproject.org VXNlIHRoZSBjb21tb24gdXRpbGl0eSBmdW5jdGlvbiwgd2hpY2ggY29udGFpbnMgY2hlY2tzIG9u IHJldHVybiB2YWx1ZXMsCmluc3RlYWQgb2YgbWFudWFsbHkgY2FsbGluZyBmY250bC4KCkNJRDog MTM3NDgzMQoKU2lnbmVkLW9mZi1ieTogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBr ZXJuZWwub3JnPgpDQzogYW50aG9ueS5wZXJhcmRAY2l0cml4LmNvbQpDQzogZ3JvdWdAa2FvZC5v cmcKQ0M6IGFuZWVzaC5rdW1hckBsaW51eC52bmV0LmlibS5jb20KQ0M6IEVyaWMgQmxha2UgPGVi bGFrZUByZWRoYXQuY29tPgotLS0KIGh3LzlwZnMveGVuLTlwLWJhY2tlbmQuYyB8IDIgKy0KIGh3 L3hlbi94ZW5fYmFja2VuZC5jICAgICB8IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3LzlwZnMveGVuLTlwLWJhY2tl bmQuYyBiL2h3LzlwZnMveGVuLTlwLWJhY2tlbmQuYwppbmRleCBhMWZkZWRlLi41ZGY5N2M5IDEw MDY0NAotLS0gYS9ody85cGZzL3hlbi05cC1iYWNrZW5kLmMKKysrIGIvaHcvOXBmcy94ZW4tOXAt YmFja2VuZC5jCkBAIC0zODAsNyArMzgwLDcgQEAgc3RhdGljIGludCB4ZW5fOXBmc19jb25uZWN0 KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikKICAgICAgICAgaWYgKHhlbl85cGRldi0+cmluZ3Nb aV0uZXZ0Y2huZGV2ID09IE5VTEwpIHsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9 Ci0gICAgICAgIGZjbnRsKHhlbmV2dGNobl9mZCh4ZW5fOXBkZXYtPnJpbmdzW2ldLmV2dGNobmRl diksIEZfU0VURkQsIEZEX0NMT0VYRUMpOworICAgICAgICBxZW11X3NldF9jbG9leGVjKHhlbmV2 dGNobl9mZCh4ZW5fOXBkZXYtPnJpbmdzW2ldLmV2dGNobmRldikpOwogICAgICAgICB4ZW5fOXBk ZXYtPnJpbmdzW2ldLmxvY2FsX3BvcnQgPSB4ZW5ldnRjaG5fYmluZF9pbnRlcmRvbWFpbgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoeGVuXzlwZGV2LT5yaW5n c1tpXS5ldnRjaG5kZXYsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB4ZW5kZXYtPmRvbSwKZGlmZiAtLWdpdCBhL2h3L3hlbi94ZW5fYmFja2VuZC5jIGIvaHcv eGVuL3hlbl9iYWNrZW5kLmMKaW5kZXggYzg1ZjE2My4uMmNhYzQ3ZCAxMDA2NDQKLS0tIGEvaHcv eGVuL3hlbl9iYWNrZW5kLmMKKysrIGIvaHcveGVuL3hlbl9iYWNrZW5kLmMKQEAgLTE0Nyw3ICsx NDcsNyBAQCBzdGF0aWMgc3RydWN0IFhlbkRldmljZSAqeGVuX2JlX2dldF94ZW5kZXYoY29uc3Qg Y2hhciAqdHlwZSwgaW50IGRvbSwgaW50IGRldiwKICAgICAgICAgcWRldl91bnBsdWcoREVWSUNF KHhlbmRldiksIE5VTEwpOwogICAgICAgICByZXR1cm4gTlVMTDsKICAgICB9Ci0gICAgZmNudGwo eGVuZXZ0Y2huX2ZkKHhlbmRldi0+ZXZ0Y2huZGV2KSwgRl9TRVRGRCwgRkRfQ0xPRVhFQyk7Cisg ICAgcWVtdV9zZXRfY2xvZXhlYyh4ZW5ldnRjaG5fZmQoeGVuZGV2LT5ldnRjaG5kZXYpKTsKIAog ICAgIGlmIChvcHMtPmZsYWdzICYgREVWT1BTX0ZMQUdfTkVFRF9HTlRERVYpIHsKICAgICAgICAg eGVuZGV2LT5nbnR0YWJkZXYgPSB4ZW5nbnR0YWJfb3BlbihOVUxMLCAwKTsKLS0gCjEuOS4xCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg==