[pve-devel] [PATCH qemu-server v3 02/12] api: remove unusable default storage parameter in check_storage_access

[Daniel Kral]

Since 0541eeb8 ("use property strings for drive options") the user input
of a volume with allocation support must be a pair of a PVE-managed
storage and an "arbitrary" string, even though only a volume name or the
size of a new disk in GB is supported [0].

This means the $volid must always be the string
"$storeid:$volname_or_size" for cloudinit images and new disks.
Therefore, the $default_storage parameter cannot be set and 'cloudinit'
is an invalid value for $volid.

Remove them as they are rejected by `verify_volume_id_or_qm_path` for
allocatable disk drives before calling this subroutine anyway, which is
used by both API handlers, i.e. `create_vm` and `update_vm`, that call
the subroutine.

[0] except the special cases "none", "cdrom" and absolute paths, which
    were introduced some time later with `pve-volume-id-or-absolute-path`
    and `pve-volume-id-or-qm-path`.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
changes since v2:
  * improve structure and reasoning in commit message
  * add $is_new_disk variable and always capture $storeid from it
  * add removal of ($volid eq 'cloudinit') reason to commit message

 PVE/API2/Qemu.pm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 626cce45..693667d5 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -148,7 +148,7 @@ my $check_drive_param = sub {
 };
 
 my $check_storage_access = sub {
-   my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage, $extraction_storage) = @_;
+   my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $extraction_storage) = @_;
 
    $foreach_volume_with_alloc->($settings, sub {
 	my ($ds, $drive) = @_;
@@ -158,13 +158,15 @@ my $check_storage_access = sub {
 	my $volid = $drive->{file};
 	my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
 
-	if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' || (defined($volname) && $volname eq 'cloudinit'))) {
+	my $is_new_disk = $volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE;
+	# the NEW_DISK_RE captures the correct storeid of the new disk
+	$storeid = $2 if $is_new_disk;
+
+	if (!$volid || ($volid eq 'none' || (defined($volname) && $volname eq 'cloudinit'))) {
 	    # nothing to check
 	} elsif ($isCDROM && ($volid eq 'cdrom')) {
 	    $rpcenv->check($authuser, "/", ['Sys.Console']);
-	} elsif (!$isCDROM && ($volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE)) {
-	    my $storeid = $2 || $default_storage;
-	    die "no storage ID specified (and no default storage)\n" if !$storeid;
+	} elsif (!$isCDROM && $is_new_disk) {
 	    $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
 	    my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
 	    raise_param_exc({ storage => "storage '$storeid' does not support vm images"})
@@ -1187,8 +1189,7 @@ __PACKAGE__->register_method({
 	if (scalar(keys $param->%*) > 0) {
 	    &$resolve_cdrom_alias($param);
 
-	    &$check_storage_access(
-		$rpcenv, $authuser, $storecfg, $vmid, $param, $storage, $extraction_storage);
+	    &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $extraction_storage);
 
 	    &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]);
 
@@ -1966,7 +1967,7 @@ my $update_vm_api  = sub {
 
     &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]);
 
-    &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, undef, $extraction_storage);
+    &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $extraction_storage);
 
     PVE::QemuServer::check_bridge_access($rpcenv, $authuser, $param);
 
-- 
2.39.5