[pve-devel] [PATCH qemu-server] Add unused description to drivedesc_hash

[Fabian Ebner]

Moved code so that initialization of drivedesc_hash stays a single block.
Avoid auto-vivication in parse_drive.

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---

Follow-up suggested by Fabian G.

I checked the call-sites for is_valid_drivename and in most cases
it won't benefit from including unused drives, often there is another
branch where unused drives are treated differently.

 PVE/QemuServer.pm       |  4 ----
 PVE/QemuServer/Drive.pm | 44 ++++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b2ff515..e0e7a87 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1091,10 +1091,6 @@ for my $key (keys %{$PVE::QemuServer::Drive::drivedesc_hash}) {
     $confdesc->{$key} = $PVE::QemuServer::Drive::drivedesc_hash->{$key};
 }
 
-for (my $i = 0; $i < $PVE::QemuServer::Drive::MAX_UNUSED_DISKS; $i++) {
-    $confdesc->{"unused$i"} = $PVE::QemuServer::Drive::unuseddesc;
-}
-
 for (my $i = 0; $i < $MAX_USB_DEVICES; $i++)  {
     $confdesc->{"usb$i"} = $usbdesc;
 }
diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm
index d412147..a08df66 100644
--- a/PVE/QemuServer/Drive.pm
+++ b/PVE/QemuServer/Drive.pm
@@ -337,6 +337,23 @@ my $efidisk_desc = {
 
 PVE::JSONSchema::register_standard_option("pve-qm-efidisk", $efidisk_desc);
 
+my $unused_fmt = {
+    volume => { alias => 'file' },
+    file => {
+	type => 'string',
+	format => 'pve-volume-id',
+	default_key => 1,
+	format_description => 'volume',
+	description => "The drive's backing volume.",
+    },
+};
+
+my $unuseddesc = {
+    optional => 1,
+    type => 'string', format => $unused_fmt,
+    description => "Reference to unused volumes. This is used internally, and should not be modified manually.",
+};
+
 for (my $i = 0; $i < $MAX_IDE_DISKS; $i++)  {
     $drivedesc_hash->{"ide$i"} = $idedesc;
 }
@@ -355,22 +372,9 @@ for (my $i = 0; $i < $MAX_VIRTIO_DISKS; $i++)  {
 
 $drivedesc_hash->{efidisk0} = $efidisk_desc;
 
-my $unused_fmt = {
-    volume => { alias => 'file' },
-    file => {
-	type => 'string',
-	format => 'pve-volume-id',
-	default_key => 1,
-	format_description => 'volume',
-	description => "The drive's backing volume.",
-    },
-};
-
-our $unuseddesc = {
-    optional => 1,
-    type => 'string', format => $unused_fmt,
-    description => "Reference to unused volumes. This is used internally, and should not be modified manually.",
-};
+for (my $i = 0; $i < $MAX_UNUSED_DISKS; $i++) {
+    $drivedesc_hash->{"unused$i"} = $unuseddesc;
+}
 
 sub valid_drive_names {
     # order is important - used to autoselect boot disk
@@ -384,7 +388,7 @@ sub valid_drive_names {
 sub is_valid_drivename {
     my $dev = shift;
 
-    return defined($drivedesc_hash->{$dev});
+    return defined($drivedesc_hash->{$dev}) && $dev !~ /^unused\d+$/;
 }
 
 PVE::JSONSchema::register_format('pve-qm-bootdisk', \&verify_bootdisk);
@@ -429,12 +433,12 @@ sub parse_drive {
 	return undef;
     }
 
-    my $desc = $key =~ /^unused\d+$/ ? $unuseddesc->{format}
-                                     : $drivedesc_hash->{$key}->{format};
-    if (!$desc) {
+    if (!defined($drivedesc_hash->{$key})) {
 	warn "invalid drive key: $key\n";
 	return undef;
     }
+
+    my $desc = $drivedesc_hash->{$key}->{format};
     my $res = eval { PVE::JSONSchema::parse_property_string($desc, $data) };
     return undef if !$res;
     $res->{interface} = $interface;
-- 
2.20.1