From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0BF831FF16B for ; Tue, 29 Jul 2025 13:15:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8045DE45F; Tue, 29 Jul 2025 13:16:11 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 13:15:29 +0200 Message-ID: <20250729111557.136012-17-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729111557.136012-1-w.bumiller@proxmox.com> References: <20250729111557.136012-1-w.bumiller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753787749813 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [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" 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'; +} + =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