From 34fd49a69b4715accd4a14aedfb103bb9ce66fed Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 22 Apr 2022 14:30:01 +0200
Subject: [PATCH] some code style refcatoring/cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/Storage/BTRFSPlugin.pm | 13 ++++++----
 PVE/Storage/Plugin.pm      | 49 +++++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/PVE/Storage/BTRFSPlugin.pm b/PVE/Storage/BTRFSPlugin.pm
index 7dac34b..be613f4 100644
--- a/PVE/Storage/BTRFSPlugin.pm
+++ b/PVE/Storage/BTRFSPlugin.pm
@@ -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) {
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 521e3e9..d2974ee 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -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){
-- 
2.39.5