Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-02-26 21:57:31 +03:00
Code Releases Activity

some code style refcatoring/cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-04-22 14:30:01 +02:00
parent 8c1a476be9
commit 34fd49a69b
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/Storage/BTRFSPlugin.pm
View File

@ -593,18 +593,21 @@ sub volume_has_feature {
current => { raw => 1 },
snap => { raw => 1 },
},
template => { current => { qcow2 => 1, raw => 1, vmdk => 1, subvol => 1 } },
template => {
current => { qcow2 => 1, raw => 1, vmdk => 1, subvol => 1 },
},
copy => {
base => { qcow2 => 1, raw => 1, subvol => 1, vmdk => 1 },
current => { qcow2 => 1, raw => 1, subvol => 1, vmdk => 1 },
snap => { qcow2 => 1, raw => 1, subvol => 1 },
},
sparseinit => { base => {qcow2 => 1, raw => 1, vmdk => 1 },
current => {qcow2 => 1, raw => 1, vmdk => 1 } },
sparseinit => {
base => { qcow2 => 1, raw => 1, vmdk => 1 },
current => { qcow2 => 1, raw => 1, vmdk => 1 },
},
};
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) =
$class->parse_volname($volname);
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = $class->parse_volname($volname);
my $key = undef;
if ($snapname) {

49
PVE/Storage/Plugin.pm
View File

@ -1052,26 +1052,43 @@ sub volume_has_feature {
my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running, $opts) = @_;
my $features = {
snapshot => { current => { qcow2 => 1}, snap => { qcow2 => 1} },
clone => { base => {qcow2 => 1, raw => 1, vmdk => 1} },
template => { current => {qcow2 => 1, raw => 1, vmdk => 1, subvol => 1} },
copy => { base => {qcow2 => 1, raw => 1, vmdk => 1},
current => {qcow2 => 1, raw => 1, vmdk => 1},
snap => {qcow2 => 1} },
sparseinit => { base => {qcow2 => 1, raw => 1, vmdk => 1},
current => {qcow2 => 1, raw => 1, vmdk => 1} },
rename => { current => {qcow2 => 1, raw => 1, vmdk => 1} },
snapshot => {
current => { qcow2 => 1 },
snap => { qcow2 => 1 },
},
clone => {
base => { qcow2 => 1, raw => 1, vmdk => 1 },
},
template => {
current => { qcow2 => 1, raw => 1, vmdk => 1, subvol => 1 },
},
copy => {
base => { qcow2 => 1, raw => 1, vmdk => 1 },
current => { qcow2 => 1, raw => 1, vmdk => 1 },
snap => { qcow2 => 1 },
},
sparseinit => {
base => { qcow2 => 1, raw => 1, vmdk => 1 },
current => { qcow2 => 1, raw => 1, vmdk => 1 },
},
rename => {
current => {qcow2 => 1, raw => 1, vmdk => 1},
},
};
# clone_image creates a qcow2 volume
return 0 if $feature eq 'clone' &&
defined($opts->{valid_target_formats}) &&
!(grep { $_ eq 'qcow2' } @{$opts->{valid_target_formats}});
if ($feature eq 'clone') {
if (
defined($opts->{valid_target_formats})
&& !(grep { $_ eq 'qcow2' } @{$opts->{valid_target_formats}})
) {
return 0; # clone_image creates a qcow2 volume
}
} elsif ($feature eq 'rename') {
return 0 if $class->can('api') && $class->api() < 10;
}
return 0 if $feature eq 'rename' && $class->can('api') && $class->api() < 10;
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) =
$class->parse_volname($volname);
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = $class->parse_volname($volname);
my $key = undef;
if($snapname){