From nobody Mon Feb 9 06:00:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599146637; cv=none; d=zohomail.com; s=zohoarc; b=YFOC8BJlrjPUpDDeu7xbIKbYrv2yj/WOm/97OmeRy3y0v5NeG6b3xbdbcuaa9ar/1gGw44jbbdMfSv6Fbt8jgor0Ypi/mlIO0woqaHxiJ5ndSsT/JhFAwoTHXVz+CGbWh+uKGZclEqu/vWDvlut3kBGtx+A6EbsQtKDGLRTRiOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599146637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V+05SS4UCsP/bMVJucHP6bpXPrium8HR8Ap+BdMCfME=; b=bl+CXrJhUnaphWhrwASvvGADza6C+1TRD/Lwv7D/X7+rW/VyYyLJjdA+qHcXRN3hHkMfuSBlnWRVPBCl9bR2SZzi1JZEcePYWCnbk23eBIxDKTA6j/UHlDyds/8+9bpr+cnNLDVAbZeeXXDeiIOmVqXKgYVMDnBXiRTlr40NXuM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599146637114254.61918912820295; Thu, 3 Sep 2020 08:23:57 -0700 (PDT) Received: from localhost ([::1]:42254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDr5g-0001bt-8d for importer@patchew.org; Thu, 03 Sep 2020 11:23:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDr4C-0008BP-La for qemu-devel@nongnu.org; Thu, 03 Sep 2020 11:22:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDr49-0007zP-OU for qemu-devel@nongnu.org; Thu, 03 Sep 2020 11:22:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-315-_cjT54a6MIilrOPFEA1GKA-1; Thu, 03 Sep 2020 11:22:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BD72425DA; Thu, 3 Sep 2020 15:22:18 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5871E2D07D; Thu, 3 Sep 2020 15:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599146541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V+05SS4UCsP/bMVJucHP6bpXPrium8HR8Ap+BdMCfME=; b=b18jxROs2iXDryRoOmwrhQchG/p9hpclmgxD8Ae7t2veZHxg5Lcu9gGAhRopNi6o4woDbT 2b5pNrB+Bkh5mGRMHjK/We0QCPYB/LrRULg3iSmIZcIdNdAbZRNCHnOPTbPvd6ETOCPTxF +F4IRRmwi5hpIBNFcyPzPXLz/+9dy2g= X-MC-Unique: _cjT54a6MIilrOPFEA1GKA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 2/8] util: split off a helper for dealing with O_CLOEXEC flag Date: Thu, 3 Sep 2020 16:22:04 +0100 Message-Id: <20200903152210.1917355-3-berrange@redhat.com> In-Reply-To: <20200903152210.1917355-1-berrange@redhat.com> References: <20200903152210.1917355-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:47:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We're going to have multiple callers to open() from qemu_open() soon. Readability would thus benefit from having a helper for dealing with O_CLOEXEC. Reviewed-by: Markus Armbruster Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- util/osdep.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/util/osdep.c b/util/osdep.c index 3d94b4d732..0d8fa9f016 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -279,6 +279,20 @@ int qemu_lock_fd_test(int fd, int64_t start, int64_t l= en, bool exclusive) } #endif =20 +static int qemu_open_cloexec(const char *name, int flags, mode_t mode) +{ + int ret; +#ifdef O_CLOEXEC + ret =3D open(name, flags | O_CLOEXEC, mode); +#else + ret =3D open(name, flags, mode); + if (ret >=3D 0) { + qemu_set_cloexec(ret); + } +#endif + return ret; +} + /* * Opens a file with FD_CLOEXEC set */ @@ -318,14 +332,7 @@ int qemu_open(const char *name, int flags, ...) va_end(ap); } =20 -#ifdef O_CLOEXEC - ret =3D open(name, flags | O_CLOEXEC, mode); -#else - ret =3D open(name, flags, mode); - if (ret >=3D 0) { - qemu_set_cloexec(ret); - } -#endif + ret =3D qemu_open_cloexec(name, flags, mode); =20 #ifdef O_DIRECT if (ret =3D=3D -1 && errno =3D=3D EINVAL && (flags & O_DIRECT)) { --=20 2.26.2