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 ADE651FF183 for ; Wed, 30 Jul 2025 11:23:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12D1637A69; Wed, 30 Jul 2025 11:25:07 +0200 (CEST) Date: Wed, 30 Jul 2025 11:24:28 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20250729111557.136012-1-w.bumiller@proxmox.com> <20250729111557.136012-18-w.bumiller@proxmox.com> In-Reply-To: <20250729111557.136012-18-w.bumiller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1753866982.60k4xvukb5.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753867460532 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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. [lvmthinplugin.pm, rbdplugin.pm, iscsidirectplugin.pm, esxiplugin.pm, iscsiplugin.pm, zfspoolplugin.pm, lvmplugin.pm, plugin.pm] Subject: Re: [pve-devel] [PATCH storage 17/26] plugins: add vtype parameter to alloc_image 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: > Signed-off-by: Wolfgang Bumiller > --- > src/PVE/Storage/BTRFSPlugin.pm | 25 ++++++++---- > src/PVE/Storage/ESXiPlugin.pm | 2 +- > src/PVE/Storage/ISCSIDirectPlugin.pm | 2 +- > src/PVE/Storage/ISCSIPlugin.pm | 2 +- > src/PVE/Storage/LVMPlugin.pm | 35 ++++++++++++----- > src/PVE/Storage/LvmThinPlugin.pm | 19 +++++++-- > src/PVE/Storage/Plugin.pm | 59 +++++++++++++++++----------- > src/PVE/Storage/RBDPlugin.pm | 27 +++++++++---- > src/PVE/Storage/ZFSPlugin.pm | 17 ++++++-- > src/PVE/Storage/ZFSPoolPlugin.pm | 35 +++++++++++------ > 10 files changed, 154 insertions(+), 69 deletions(-) > > diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm > index 585489c..0a42c88 100644 > --- a/src/PVE/Storage/BTRFSPlugin.pm > +++ b/src/PVE/Storage/BTRFSPlugin.pm > @@ -13,6 +13,7 @@ use POSIX qw(EEXIST); > > use PVE::Tools qw(run_command dir_glob_foreach); > > +use PVE::Storage::Common; > use PVE::Storage::DirPlugin; > > use constant { > @@ -193,15 +194,16 @@ sub filesystem_path { > > my $path = $class->get_subdir($scfg, $vtype); > > - $path .= "/$vmid" if $vtype eq 'images'; > + my $is_volume_type = PVE::Storage::Common::is_volume_type($vtype); > + $path .= "/$vmid" if $is_volume_type; > > - if ($vtype eq 'images' && defined($format) && $format eq 'raw') { > + if ($is_volume_type && defined($format) && $format eq 'raw') { > my $dir = raw_name_to_dir($name); > if ($snapname) { > $dir .= "\@$snapname"; > } > $path .= "/$dir/disk.raw"; > - } elsif ($vtype eq 'images' && defined($format) && $format eq 'subvol') { > + } elsif ($is_volume_type && defined($format) && $format eq 'subvol') { > $path .= "/$name"; > if ($snapname) { > $path .= "\@$snapname"; > @@ -322,19 +324,28 @@ sub clone_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > if ($fmt ne 'raw' && $fmt ne 'subvol') { > - return $class->SUPER::alloc_image($storeid, $scfg, $vmid, $fmt, $name, $size); > + return $class->SUPER::alloc_image($storeid, $scfg, $vmid, $fmt, $name, $size, $vtype); > } > > # From Plugin.pm: > > - my $imagedir = $class->get_subdir($scfg, 'images') . "/$vmid"; > + my $imagedir = $class->get_subdir($scfg, $vtype // 'images') . "/$vmid"; > > mkpath $imagedir; > > - $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1) if !$name; > + if ($name) { > + if (defined($vtype)) { > + die "illegal name '$name' - should be 'vol-vm-$vmid-*'\n" > + if $vtype eq 'vm-vol' && $name !~ m/^vol-vm-$vmid-/; > + die "illegal name '$name' - should be 'vol-ct-$vmid-*'\n" > + if $vtype eq 'ct-vol' && $name !~ m/^vol-ct-$vmid-/; > + } couldn't we parse the name and check the vtype that returns, like we do for the format below? > + } else { > + $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1, $vtype); > + } > > my (undef, $tmpfmt) = PVE::Storage::Plugin::parse_name_dir($name); > > diff --git a/src/PVE/Storage/ESXiPlugin.pm b/src/PVE/Storage/ESXiPlugin.pm > index ea2f8f9..d10b156 100644 > --- a/src/PVE/Storage/ESXiPlugin.pm > +++ b/src/PVE/Storage/ESXiPlugin.pm > @@ -480,7 +480,7 @@ sub path { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > die "creating images is not supported for $class\n"; > } > diff --git a/src/PVE/Storage/ISCSIDirectPlugin.pm b/src/PVE/Storage/ISCSIDirectPlugin.pm > index 98a3391..0fee541 100644 > --- a/src/PVE/Storage/ISCSIDirectPlugin.pm > +++ b/src/PVE/Storage/ISCSIDirectPlugin.pm > @@ -140,7 +140,7 @@ sub clone_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > die "can't allocate space in iscsi storage\n"; > } > diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm > index 77a9173..5118d73 100644 > --- a/src/PVE/Storage/ISCSIPlugin.pm > +++ b/src/PVE/Storage/ISCSIPlugin.pm > @@ -402,7 +402,7 @@ sub clone_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > die "can't allocate space in iscsi storage\n"; > } > diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm > index 55c4578..af789ba 100644 > --- a/src/PVE/Storage/LVMPlugin.pm > +++ b/src/PVE/Storage/LVMPlugin.pm > @@ -535,7 +535,7 @@ sub clone_image { > } > > sub find_free_diskname { > - my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix, $vtype) = @_; > > my $vg = $scfg->{vgname}; > > @@ -546,7 +546,7 @@ sub find_free_diskname { > $add_fmt_suffix = $fmt && $fmt eq 'qcow2' ? 1 : undef; > > return PVE::Storage::Plugin::get_next_vm_diskname( > - $disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix, > + $disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix, $vtype, > ); > } > > @@ -628,8 +628,8 @@ my sub calculate_lvm_size { > return $info->{'fully-allocated'} / 1024; > } > > -my sub alloc_lvm_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $backing_snap) = @_; > +my sub alloc_lvm_image : prototype($$$$$$$$$) { > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $backing_snap, $vtype) = @_; > > die "unsupported format '$fmt'" if $fmt ne 'raw' && $fmt ne 'qcow2'; > > @@ -637,6 +637,20 @@ my sub alloc_lvm_image { > if $fmt eq 'qcow2' > && !$scfg->{'snapshot-as-volume-chain'}; > > + if ($name) { > + if (defined($vtype) && $vtype eq 'vm-vol') { > + die "illegal name '$name' - should be 'vol-vm-$vmid-*'\n" > + if $name !~ m/^vol-vm-$vmid-/; > + } elsif (defined($vtype) && $vtype eq 'ct-vol') { > + die "illegal name '$name' - should be 'vol-ct-$vmid-*'\n" > + if $name !~ m/^vol-ct-$vmid-/; > + } else { > + die "illegal name '$name'" > + . " - should be 'vm-$vmid-*', 'vol-vm-$vmid-*' or 'vol-ct-$vmid-*'\n" > + if $name !~ m/^(?:vol-vm|vol-ct|vm)-$vmid-/; > + } > + } > + same question here.. > $class->parse_volname($name); > > my $vgs = lvm_vgs(); > @@ -672,20 +686,20 @@ my sub alloc_lvm_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > - $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt) > + $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 0, $vtype) > if !$name; > > - alloc_lvm_image($class, $storeid, $scfg, $vmid, $fmt, $name, $size); > + alloc_lvm_image($class, $storeid, $scfg, $vmid, $fmt, $name, $size, undef, $vtype); > > return $name; > } > > -my sub alloc_snap_image { > +my sub alloc_snap_image : prototype($$$$$) { > my ($class, $storeid, $scfg, $volname, $backing_snap) = @_; > > - my ($vmid, $format) = ($class->parse_volname($volname))[2, 6]; > + my ($vtype, $vmid, $format) = ($class->parse_volname($volname))[0, 2, 6]; > my $path = $class->path($scfg, $volname, $storeid, $backing_snap); > > #we need to use same size than the backing image qcow2 virtual-size > @@ -694,7 +708,8 @@ my sub alloc_snap_image { > > $size = $size / 1024; #we use kb in lvcreate > > - alloc_lvm_image($class, $storeid, $scfg, $vmid, $format, $volname, $size, $backing_snap); > + alloc_lvm_image($class, $storeid, $scfg, $vmid, $format, $volname, $size, $backing_snap, > + $vtype); > } > > my sub free_snap_image { > diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm > index f6615d9..2071822 100644 > --- a/src/PVE/Storage/LvmThinPlugin.pm > +++ b/src/PVE/Storage/LvmThinPlugin.pm > @@ -122,12 +122,23 @@ my $set_lv_autoactivation = sub { > }; > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > die "unsupported format '$fmt'" if $fmt ne 'raw'; > > - die "illegal name '$name' - should be 'vm-$vmid-*'\n" > - if $name && $name !~ m/^vm-$vmid-/; > + if ($name) { > + if (defined($vtype) && $vtype eq 'vm-vol') { > + die "illegal name '$name' - should be 'vol-vm-$vmid-*'\n" > + if $name !~ m/^vol-vm-$vmid-/; > + } elsif (defined($vtype) && $vtype eq 'ct-vol') { > + die "illegal name '$name' - should be 'vol-ct-$vmid-*'\n" > + if $name !~ m/^vol-ct-$vmid-/; > + } else { > + die "illegal name '$name'" > + . " - should be 'vm-$vmid-*', 'vol-vm-$vmid-*' or 'vol-ct-$vmid-*'\n" > + if $name !~ m/^(?:vol-vm|vol-ct|vm)-$vmid-/; > + } > + } and here.. > > my $vgs = PVE::Storage::LVMPlugin::lvm_vgs(); > > @@ -135,7 +146,7 @@ sub alloc_image { > > die "no such volume group '$vg'\n" if !defined($vgs->{$vg}); > > - $name = $class->find_free_diskname($storeid, $scfg, $vmid) > + $name = $class->find_free_diskname($storeid, $scfg, $vmid, undef, 0, $vtype) > if !$name; > > my $cmd = [ > diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm > index 660045d..adaca47 100644 > --- a/src/PVE/Storage/Plugin.pm > +++ b/src/PVE/Storage/Plugin.pm > @@ -851,7 +851,7 @@ sub filesystem_path { > > my $dir = $class->get_subdir($scfg, $vtype); > > - $dir .= "/$vmid" if $vtype eq 'images'; > + $dir .= "/$vmid" if PVE::Storage::Common::is_volume_type($vtype); > > my $path = "$dir/$name"; > > @@ -912,30 +912,34 @@ sub create_base { > } > > my $get_vm_disk_number = sub { > - my ($disk_name, $scfg, $vmid, $suffix) = @_; > - > - my $disk_regex = qr/(vm|base)-$vmid-disk-(\d+)$suffix/; > - > - my $type = $scfg->{type}; > - my $def = { %{ $defaultData->{plugindata}->{$type} } }; > - > - my $valid = $def->{format}->[0]; > - if ($valid->{subvol}) { > - $disk_regex = qr/(vm|base|subvol|basevol)-$vmid-disk-(\d+)/; > - } > - > - if ($disk_name =~ m/$disk_regex/) { > - return $2; > + my ($disk_volid, $scfg, $vmid, $suffix) = @_; > + > + # Dir storage have a vmid/ subdir, zfs/lvm/rbd/... do not. > + # Also: LVM storages don't pass the `storeid:` prefix... should we fix that up? > + if ($disk_volid =~ m!^(?:[^:]+:)? (?:\d+/)? $DISK_NAME_REGEX $!xn) { > + my $label = $+{label}; > + # Dir storages have a format suffix, zfs/lvm/rbd/... do not. > + if ($label =~ /^disk-(\d+)(?:\..*)?$/) { > + return int($1); > + } > } > > return undef; > }; > > +# note: disk_list is an array of *volids* > sub get_next_vm_diskname { > - my ($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix) = @_; > + my ($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix, $vtype) = @_; > > $fmt //= ''; > - my $prefix = ($fmt eq 'subvol') ? 'subvol' : 'vm'; > + my $prefix; > + if (defined($vtype) && $vtype eq 'vm-vol') { > + $prefix = 'vol-vm'; > + } elsif (defined($vtype) && $vtype eq 'ct-vol') { > + $prefix = ($fmt eq 'subvol') ? 'subvol-ct' : 'vol-ct'; > + } else { > + $prefix = ($fmt eq 'subvol') ? 'subvol' : 'vm'; > + } > my $suffix = $add_fmt_suffix ? ".$fmt" : ''; > > my $disk_ids = {}; > @@ -954,13 +958,13 @@ sub get_next_vm_diskname { > } > > sub find_free_diskname { > - my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix, $vtype) = @_; > > - my $disks = $class->list_images($storeid, $scfg, $vmid); > + my $disks = $class->list_images($storeid, $scfg, $vmid, undef, undef, $vtype); > > my $disk_list = [map { $_->{volid} } @$disks]; > > - return get_next_vm_diskname($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix); > + return get_next_vm_diskname($disk_list, $storeid, $vmid, $fmt, $scfg, $add_fmt_suffix, $vtype); > } > > sub clone_image { > @@ -1011,14 +1015,23 @@ sub clone_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > - my $imagedir = $class->get_subdir($scfg, 'images'); > + my $imagedir = $class->get_subdir($scfg, $vtype // 'images'); > $imagedir .= "/$vmid"; > > mkpath $imagedir; > > - $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1) if !$name; > + if ($name) { > + if (defined($vtype)) { > + die "illegal name '$name' - should be 'vol-vm-$vmid-*'\n" > + if $vtype eq 'vm-vol' && $name !~ m/^vol-vm-$vmid-/; > + die "illegal name '$name' - should be 'vol-ct-$vmid-*'\n" > + if $vtype eq 'ct-vol' && $name !~ m/^vol-ct-$vmid-/; > + } same question here > + } else { > + $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1, $vtype); > + } > > my (undef, $tmpfmt) = parse_name_dir($name); > > diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm > index 2ef1280..839ff73 100644 > --- a/src/PVE/Storage/RBDPlugin.pm > +++ b/src/PVE/Storage/RBDPlugin.pm > @@ -620,7 +620,7 @@ sub qemu_blockdev_options { > } > > sub find_free_diskname { > - my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix, $vtype) = @_; > > my $cmd = $rbd_cmd->($scfg, $storeid, 'ls'); > > @@ -640,7 +640,9 @@ sub find_free_diskname { > > die $err if $err && $err !~ m/doesn't contain rbd images/; > > - return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, undef, $scfg); > + return PVE::Storage::Plugin::get_next_vm_diskname( > + $disk_list, $storeid, $vmid, undef, $scfg, 0, $vtype, > + ); > } > > sub create_base { > @@ -730,12 +732,23 @@ sub clone_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > - > - die "illegal name '$name' - should be 'vm-$vmid-*'\n" > - if $name && $name !~ m/^vm-$vmid-/; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > + > + if ($name) { > + if (defined($vtype) && $vtype eq 'vm-vol') { > + die "illegal name '$name' - should be 'vol-vm-$vmid-*'\n" > + if $name !~ m/^vol-vm-$vmid-/; > + } elsif (defined($vtype) && $vtype eq 'ct-vol') { > + die "illegal name '$name' - should be 'vol-ct-$vmid-*'\n" > + if $name !~ m/^vol-ct-$vmid-/; > + } else { > + die "illegal name '$name'" > + . " - should be 'vm-$vmid-*', 'vol-vm-$vmid-*' or 'vol-ct-$vmid-*'\n" > + if $name !~ m/^(?:vol-vm|vol-ct|vm)-$vmid-/; > + } and also here > + } > > - $name = $class->find_free_diskname($storeid, $scfg, $vmid) if !$name; > + $name = $class->find_free_diskname($storeid, $scfg, $vmid, undef, 0, $vtype) if !$name; > > my @options = ( > '--image-format', 2, '--size', int(($size + 1023) / 1024), > diff --git a/src/PVE/Storage/ZFSPlugin.pm b/src/PVE/Storage/ZFSPlugin.pm > index a05f521..259e468 100644 > --- a/src/PVE/Storage/ZFSPlugin.pm > +++ b/src/PVE/Storage/ZFSPlugin.pm > @@ -355,16 +355,25 @@ sub clone_image { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > die "unsupported format '$fmt'" if $fmt ne 'raw'; > > - die "illegal name '$name' - should be 'vm-$vmid-*'\n" > - if $name && $name !~ m/^vm-$vmid-/; > + if ($name) { > + if (defined($vtype) && $vtype eq 'vm-vol') { > + die "illegal name '$name' - should be 'vol-vm-$vmid-*'\n" > + if $name !~ m/^vol-vm-$vmid-/; > + } elsif (defined($vtype) && $vtype eq 'ct-vol') { > + die "non-subvolumes not allowed for containers\n"; > + } else { > + die "illegal name '$name'" . " - should be 'vm-$vmid-*', 'vol-vm-$vmid-*'\n" > + if $name !~ m/^(?:vol-vm|vm)-$vmid-/; > + } > + } and here > > my $volname = $name; > > - $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt) if !$volname; > + $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 0, $vtype) if !$volname; > > $class->zfs_create_zvol($scfg, $volname, $size); > > diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm > index d65af69..f972718 100644 > --- a/src/PVE/Storage/ZFSPoolPlugin.pm > +++ b/src/PVE/Storage/ZFSPoolPlugin.pm > @@ -271,29 +271,42 @@ sub zfs_wait_for_zvol_link { > } > > sub alloc_image { > - my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; > + my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size, $vtype) = @_; > > my $volname = $name; > > if ($fmt eq 'raw') { > - > - die "illegal name '$volname' - should be 'vm-$vmid-*'\n" > - if $volname && $volname !~ m/^vm-$vmid-/; > - $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt) > + $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 0, $vtype) > if !$volname; > > + if ($vtype) { > + die "'raw' format not allowed for container volumes\n" > + if $vtype ne 'vm-vol'; > + > + die "illegal name '$volname' - should be 'vol-vm-$vmid-*'\n" > + if $volname !~ m/^vol-vm-$vmid-/; > + } else { > + die "illegal name '$volname' - should be 'vol-vm-$vmid-*' or 'vm-$vmid-*'\n" > + if $volname !~ m/^(vol-)?vm-$vmid-/; > + } > + here as well > $class->zfs_create_zvol($scfg, $volname, $size); > $class->zfs_wait_for_zvol_link($scfg, $volname); > > } elsif ($fmt eq 'subvol') { > - > - die "illegal name '$volname' - should be 'subvol-$vmid-*'\n" > - if $volname && $volname !~ m/^subvol-$vmid-/; > - $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt) > + $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 0, $vtype) > if !$volname; > > - die "illegal name '$volname' - should be 'subvol-$vmid-*'\n" > - if $volname !~ m/^subvol-$vmid-/; > + if ($vtype) { > + die "'subvol' format not allowed for VM volumes\n" > + if $vtype ne 'ct-vol'; > + > + die "illegal name '$volname' - should be 'subvol-ct-$vmid-*'\n" > + if $volname !~ m/^subvol-ct-$vmid-/; > + } else { > + die "illegal name '$volname' - should be 'subvol-ct-$vmid-*' or 'subvol-$vmid-*'\n" > + if $volname !~ m/^subvol(-ct)?-$vmid-/; > + } and here as well.. > > $class->zfs_create_subvol($scfg, $volname, $size); > > -- > 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