[pve-devel] [PATCH qemu-server v2 06/32] drive: parse: use hash argument for optional parameters

[Fiona Ebner]

In preparation to add a new one.

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

No changes in v2.

 src/PVE/API2/Qemu.pm        | 15 ++++++++++-----
 src/PVE/QemuServer/Drive.pm |  6 ++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index ce6f362d..9b07db25 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/PVE/API2/Qemu.pm
@@ -89,7 +89,8 @@ my $foreach_volume_with_alloc = sub {
     for my $opt (sort keys $param->%*) {
         next if !PVE::QemuServer::is_valid_drivename($opt);
 
-        my $drive = PVE::QemuServer::Drive::parse_drive($opt, $param->{$opt}, 1);
+        my $drive =
+            PVE::QemuServer::Drive::parse_drive($opt, $param->{$opt}, { 'with-alloc' => 1 });
         next if !$drive;
 
         $func->($opt, $drive);
@@ -102,7 +103,7 @@ my $check_drive_param = sub {
     for my $opt (sort keys $param->%*) {
         next if !PVE::QemuServer::is_valid_drivename($opt);
 
-        my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}, 1);
+        my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}, { 'with-alloc' => 1 });
         raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
 
         if ($drive->{'import-from'}) {
@@ -969,7 +970,7 @@ my $check_vm_modify_config_perm = sub {
 sub assert_scsi_feature_compatibility {
     my ($opt, $conf, $storecfg, $drive_attributes) = @_;
 
-    my $drive = PVE::QemuServer::Drive::parse_drive($opt, $drive_attributes, 1);
+    my $drive = PVE::QemuServer::Drive::parse_drive($opt, $drive_attributes, { 'with-alloc' => 1 });
 
     my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, undef, $conf->{arch});
     my $machine_version = PVE::QemuServer::Machine::extract_version(
@@ -2144,7 +2145,7 @@ my $update_vm_api = sub {
 
             my $check_drive_perms = sub {
                 my ($opt, $val) = @_;
-                my $drive = PVE::QemuServer::parse_drive($opt, $val, 1);
+                my $drive = PVE::QemuServer::parse_drive($opt, $val, { 'with-alloc' => 1 });
                 if (PVE::QemuServer::drive_is_cloudinit($drive)) {
                     $rpcenv->check_vm_perm(
                         $authuser,
@@ -2311,7 +2312,11 @@ my $update_vm_api = sub {
                     # default legacy boot order implies all cdroms anyway
                     if (@bootorder) {
                         # append new CD drives to bootorder to mark them bootable
-                        my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}, 1);
+                        my $drive = PVE::QemuServer::parse_drive(
+                            $opt,
+                            $param->{$opt},
+                            { 'with-alloc' => 1 },
+                        );
                         if (
                             PVE::QemuServer::drive_is_cdrom($drive, 1)
                             && !grep(/^$opt$/, @bootorder)
diff --git a/src/PVE/QemuServer/Drive.pm b/src/PVE/QemuServer/Drive.pm
index 0947b9ed..b9ceb130 100644
--- a/src/PVE/QemuServer/Drive.pm
+++ b/src/PVE/QemuServer/Drive.pm
@@ -770,7 +770,9 @@ sub drive_is_read_only {
 #        [,iothread=on][,serial=serial][,model=model]
 
 sub parse_drive {
-    my ($key, $data, $with_alloc) = @_;
+    my ($key, $data, $parse_opts) = @_;
+
+    $parse_opts //= {};
 
     my ($interface, $index);
 
@@ -781,7 +783,7 @@ sub parse_drive {
         return;
     }
 
-    my $desc_hash = $with_alloc ? $drivedesc_hash_with_alloc : $drivedesc_hash;
+    my $desc_hash = $parse_opts->{'with-alloc'} ? $drivedesc_hash_with_alloc : $drivedesc_hash;
 
     if (!defined($desc_hash->{$key})) {
         warn "invalid drive key: $key\n";
-- 
2.39.5