From nobody Thu Jan 9 23:11:17 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653491835; cv=none; d=zohomail.com; s=zohoarc; b=DHL4PgYkluCNMWZVPJYH1XEA58rxGjOLLMJNHpFpxeepc+6phZzNEaZjVNSRLFcgdFmQXulDoUdyZEvDlpk+uw2Ud+FDdUAQG/Nl9EJXt40kRe3pGqV8kWlbrENLLco0cw+NMlhhclk44y45gTiCLVym8mwhxgh+T8DRMq0VPe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653491835; 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=XpST3xr1kVKb7PaMJB8Emv+GgCBuZy2G3wWIf1G+QQo=; b=cDA2xBKUyjEztV06izJ098eQPtL25Ro5TOwNHciikSmBfC6tjismST2Tr4qICRo/4/eUOcnQKU0btTXHOJHz9rgspDTJEihvn5A0SFMwjqccROk4WxHw/ADzI19LDeVJ4zmJEAdP5aQlVKSHnCJ0aa57qPkKGpRJRQmP/mZkE2s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653491835401940.5102014503876; Wed, 25 May 2022 08:17:15 -0700 (PDT) Received: from localhost ([::1]:34280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntsl8-0008Aw-Bo for importer2@patchew.org; Wed, 25 May 2022 11:17:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntsGo-00039a-MY for qemu-devel@nongnu.org; Wed, 25 May 2022 10:45:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntsCv-000654-Ce for qemu-devel@nongnu.org; Wed, 25 May 2022 10:41:54 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-12-Qn3z7aFmMvOg1jl_DZ0vnw-1; Wed, 25 May 2022 10:41:51 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D2903C0ED45 for ; Wed, 25 May 2022 14:41:51 +0000 (UTC) Received: from localhost (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id D43DF40C1240; Wed, 25 May 2022 14:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653489712; 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=XpST3xr1kVKb7PaMJB8Emv+GgCBuZy2G3wWIf1G+QQo=; b=EMtyHmHQ9ZuhTMmhWRpJL+m8v81k/5AfrN+KZkxaI31IvcsGw+FbtNfpAO5MufauiXXFS7 skb4YSGst8WD2wA+EISU8SwYQRzKKnB9g3LpC1TQDwSIiS4lC/rnPguqaIRc4CGmkjQtMS Iz/Hi3QYW2ieCKGtD2VGajyjdwJBY7s= X-MC-Unique: Qn3z7aFmMvOg1jl_DZ0vnw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Konstantin Kostiuk , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v5 05/15] qga: add qga_open_cloexec() helper Date: Wed, 25 May 2022 16:41:30 +0200 Message-Id: <20220525144140.591926-6-marcandre.lureau@redhat.com> In-Reply-To: <20220525144140.591926-1-marcandre.lureau@redhat.com> References: <20220525144140.591926-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653491836777100001 From: Marc-Andr=C3=A9 Lureau QGA calls qemu_open_old() in various places. Calling qemu_open() instead isn't a great alternative, as it has special "/dev/fdset" handling and depends on QEMU internal monitor data structures. Instead, provide a simple helper for QGA needs, with Error* support. The following patches will make use of it. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- qga/cutils.h | 8 ++++++++ qga/cutils.c | 33 +++++++++++++++++++++++++++++++++ qga/meson.build | 1 + 3 files changed, 42 insertions(+) create mode 100644 qga/cutils.h create mode 100644 qga/cutils.c diff --git a/qga/cutils.h b/qga/cutils.h new file mode 100644 index 0000000000..f0f30a7d28 --- /dev/null +++ b/qga/cutils.h @@ -0,0 +1,8 @@ +#ifndef CUTILS_H_ +#define CUTILS_H_ + +#include "qemu/osdep.h" + +int qga_open_cloexec(const char *name, int flags, mode_t mode); + +#endif /* CUTILS_H_ */ diff --git a/qga/cutils.c b/qga/cutils.c new file mode 100644 index 0000000000..b8e142ef64 --- /dev/null +++ b/qga/cutils.c @@ -0,0 +1,33 @@ +/* + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#include "cutils.h" + +#include "qapi/error.h" + +/** + * qga_open_cloexec: + * @name: the pathname to open + * @flags: as in open() + * @mode: as in open() + * + * A wrapper for open() function which sets O_CLOEXEC. + * + * On error, -1 is returned. + */ +int qga_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; +} diff --git a/qga/meson.build b/qga/meson.build index 6d9f39bb32..35fe2229e9 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -65,6 +65,7 @@ qga_ss.add(files( 'commands.c', 'guest-agent-command-state.c', 'main.c', + 'cutils.c', )) qga_ss.add(when: 'CONFIG_POSIX', if_true: files( 'channel-posix.c', --=20 2.36.1