From nobody Thu Sep 19 00:52:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1721835525068983.7968996120848; Wed, 24 Jul 2024 08:38:45 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0B10111CA; Wed, 24 Jul 2024 11:38:44 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 20BFA447; Wed, 24 Jul 2024 11:35:08 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6155CD4E; Wed, 24 Jul 2024 11:35:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F0800D4E for ; Wed, 24 Jul 2024 11:34:46 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-ipzf-FIVP6-NCqgRYJ0NLQ-1; Wed, 24 Jul 2024 11:34:44 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C39B71955EB3 for ; Wed, 24 Jul 2024 15:34:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.23]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B03D41955D56 for ; Wed, 24 Jul 2024 15:34:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721835286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z8L+ruZVqUBg4mb1q9iURPH73e7WWLeCQ/LA3y0kRTY=; b=J6ofdO/BbVD6HtprjBPrWn1mWCD6rdP/S2Z5cGBja57W41xv6F/pBDS0yliAZwyBhHUkdO jLw7RNFH7P4VWCm6awsQqB0ITSAmeMR5dtdqcTgJD6RrO/GlGjtcYaIqk3hMsumqrxYTyW BTkqc5m+IiWzt4ElKgxbi3SllAdwnCQ= X-MC-Unique: ipzf-FIVP6-NCqgRYJ0NLQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 6/8] virFileIsSharedFSOverride: Export Date: Wed, 24 Jul 2024 17:34:30 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TDUX6RH5ZWRB2KGUZTUFXKSVKONCJPVA X-Message-ID-Hash: TDUX6RH5ZWRB2KGUZTUFXKSVKONCJPVA X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1721835527091116600 Content-Type: text/plain; charset="utf-8" Document the function and export it for use outside of the 'virfile' utils module. Signed-off-by: Peter Krempa --- src/libvirt_private.syms | 1 + src/util/virfile.c | 12 +++++++++++- src/util/virfile.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c35366c9e1..5f2f8f7031 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2353,6 +2353,7 @@ virFileIsLink; virFileIsMountPoint; virFileIsRegular; virFileIsSharedFS; +virFileIsSharedFSOverride; virFileIsSharedFSType; virFileLength; virFileLinkPointsTo; diff --git a/src/util/virfile.c b/src/util/virfile.c index a8abd7d913..6ac0f4efb3 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3804,7 +3804,16 @@ virFileGetDefaultHugepage(virHugeTLBFS *fs, return NULL; } -static bool + +/** + * virFileIsSharedFSOverride: + * @path: Path to check + * @overrides: string list of path overrides + * + * Checks whether @path is inside any of the shared filesystem override + * directories passed as @overrides. + */ +bool virFileIsSharedFSOverride(const char *path, char *const *overrides) { @@ -3841,6 +3850,7 @@ virFileIsSharedFSOverride(const char *path, return false; } + int virFileIsSharedFS(const char *path, char *const *overrides) { diff --git a/src/util/virfile.h b/src/util/virfile.h index 4f9d2bd5da..e760724037 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -234,6 +234,8 @@ enum { VIR_FILE_SHFS_BEEGFS =3D (1 << 11), /* BeeGFS/fhGFS */ }; +bool virFileIsSharedFSOverride(const char *path, + char *const *overrides); int virFileIsSharedFSType(const char *path, unsigned int fstypes) ATTRIBUT= E_NONNULL(1); int virFileIsSharedFS(const char *path, char *const *overrides) ATTRIBUTE_NONNULL(1); --=20 2.45.2