From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id ADD651FF183 for ; Wed, 30 Jul 2025 10:35:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F05D036376; Wed, 30 Jul 2025 10:36:57 +0200 (CEST) Date: Wed, 30 Jul 2025 10:36:49 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20250729111557.136012-1-w.bumiller@proxmox.com> <20250729111557.136012-17-w.bumiller@proxmox.com> In-Reply-To: <20250729111557.136012-17-w.bumiller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1753863153.pmsj6927ok.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753864602102 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, common.pm] Subject: Re: [pve-devel] [PATCH storage 16/26] common: add volume_type_from_name convenience helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On July 29, 2025 1:15 pm, Wolfgang Bumiller wrote: > For plugins which follow our new naming scheme. > > Signed-off-by: Wolfgang Bumiller > --- > src/PVE/Storage/Common.pm | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/src/PVE/Storage/Common.pm b/src/PVE/Storage/Common.pm > index 7086e1c..813fba6 100644 > --- a/src/PVE/Storage/Common.pm > +++ b/src/PVE/Storage/Common.pm > @@ -313,6 +313,35 @@ sub should_list_images : prototype($$) ($expected_content_type, $volume_type) { > return $expected_content_type eq $volume_type; > } > > +=head3 volume_type_from_name > + > + volume_type_from_name($name) > + > +This is available for storages which follow our most common naming scheme relating to volume types: > +A "vol-vm-" prefix for the C vtype, and a "vol-ct-" prefix for the C vtype. > + > +This function allows (and ignores) an optional "base-" prefix, such that > +"base-vol-ct-100-disk-0.raw" would return C. > + > +In any other case it returns C. > + > +=cut > + > +sub volume_type_from_name : prototype($) { > + my ($name) = @_; > + > + if ($name =~ /^(?:base-)?(?:(?:sub)?vol-(vm|ct))-/) { > + return "$1-vol"; > + } > + > + # Note: Despite the legacy `subvol-*` and `basevol-*` dirs always being containers, giving > + # them the vtype `ct-vol` would break `path_to_volume_id` which would expect their volids to > + # be in the `cts/` subdir instead of in `images/`... > + # return 'ct-vol' if $name =~ /^(?:subvol|basevol)-/; > + > + return 'images'; > +} ZFSPoolPlugin has it's own variant of this, and this one here seems unused? > + > =head3 is_volume_type > > is_volume_type($vtype) > -- > 2.47.2 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel