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 21A5E1FF183 for ; Wed, 30 Jul 2025 11:00:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 968D437321; Wed, 30 Jul 2025 11:02:00 +0200 (CEST) Date: Wed, 30 Jul 2025 11:01:03 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20250729111557.136012-1-w.bumiller@proxmox.com> <20250729111557.136012-16-w.bumiller@proxmox.com> In-Reply-To: <20250729111557.136012-16-w.bumiller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1753865974.w7lxzvtwb8.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753866055841 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH storage 15/26] common: add is_volume_type and is_type_change_allowed helpers 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: > Generally we want to allow transitioning from 'images' or 'rootdir' to > 'vm-vol' or 'ct-vol' respectively, but not the other way round. > Obviously, staying *within* any of the types is also allowed. > > The `is_volume_type` helper is just a convenience helper for > functionality such as, for directory based storages, deciding whether > a volume needs a VMID subdirectory. > > Signed-off-by: Wolfgang Bumiller > --- > src/PVE/Storage/Common.pm | 42 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/src/PVE/Storage/Common.pm b/src/PVE/Storage/Common.pm > index bab1260..7086e1c 100644 > --- a/src/PVE/Storage/Common.pm > +++ b/src/PVE/Storage/Common.pm > @@ -313,4 +313,46 @@ sub should_list_images : prototype($$) ($expected_content_type, $volume_type) { > return $expected_content_type eq $volume_type; > } > > +=head3 is_volume_type > + > + is_volume_type($vtype) > + > +Returns true if C<$vtype> is C, C, C or C. then it should be called `vtype_is_vdisk`. the `v` in `vtype` stands for `volume`, so every vtype is by definition a volume.. > + > +Convenience helper to distinguish volume vtypes and content types from other types. > + > +=cut > + > +my %VOLUME_TYPE = map { $_ => 1 } qw(images vm-vol rootdir ct-vol); > + > +sub is_volume_type : prototype($) ($vtype) { > + return $VOLUME_TYPE{$vtype}; > +} > + > +=head3 is_type_change_allowed > + > + is_type_change_allowed($source_vtype, $target_vtype) > + > +Returns true if a volume may change from C<$source_vtype> to C<$target_vtype>. > + > +This is generally allowed if the target vtype is equal or "more strict" than the source vtype. That > +is, if the source vtype is not known, is C<"images">, or equal to C<$target_vtype>. > + > +Note that without a target vtype, only generic source vtypes (C or C<"images">) are allowed. > + > +=cut > + > +sub is_type_change_allowed : prototype($$) ($from, $to) { this should probably be limited to vdisks? > + # If the source is unknown we don't care: > + return 1 if !defined($from); > + > + # Likewise, if the source is "images" we don't actually know what it represents. > + return 1 if $from eq 'images'; > + > + # Otherwise if *both* are defined they must be equal. > + return 1 if defined($from) && defined($to) && $from eq $to; # > + > + return undef; > +} > + > 1; > -- > 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