[pve-devel] [PATCH qemu-server v3 08/12] api: {create, update}_vm: use volume content type assertion helpers

[Daniel Kral]

Make use of the newly introduced content type assertion helpers in the
preconditions check paths and the call to `vdisk_alloc` in the API
handlers for creating a VM or updating a VM with newly allocated VM,
EFI, TPM and/or cloudinit images.

Since the preconditions existed before, adding a content type safeguard
at `vdisk_alloc` does not break the API.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
changes since v2:
  * rename helper from *_supported to *_available
  * lower storage_check_enabled to storage_config where possible due to
    the helper already checking that
  * change of vdisk_alloc signature with required $vtype

 PVE/API2/Qemu.pm            | 11 +++++------
 PVE/QemuServer.pm           |  2 +-
 PVE/QemuServer/Cloudinit.pm |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index e9eb2b2e..6931aa18 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -169,9 +169,8 @@ my $check_storage_access = sub {
 	    $rpcenv->check($authuser, "/", ['Sys.Console']);
 	} elsif (!$isCDROM && ($is_new_disk || $is_cloudinit)) {
 	    $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"})
-		if !$scfg->{content}->{images};
+	    eval { PVE::Storage::assert_content_type_available($storecfg, $storeid, 'images') };
+	    raise_param_exc({ storage => "$@" }) if $@;
 	} else {
 	    PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
 	    if ($storeid) {
@@ -434,7 +433,7 @@ my sub create_disks : prototype($$$$$$$$$$$) {
 	    # Initial disk created with 4 MB and aligned to 4MB on regeneration
 	    my $ci_size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE;
 	    my $volid = PVE::Storage::vdisk_alloc(
-		$storecfg, $storeid, $vmid, $fmt, 'any', $ci_size/1024, { name => $name });
+		$storecfg, $storeid, $vmid, $fmt, 'images', $ci_size/1024, { name => $name });
 	    $disk->{file} = $volid;
 	    $disk->{media} = 'cdrom';
 	    push @$vollist, $volid;
@@ -580,10 +579,10 @@ my sub create_disks : prototype($$$$$$$$$$$) {
 		    # swtpm can only use raw volumes, and uses a fixed size
 		    $size = PVE::Tools::convert_size(PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE, 'b' => 'kb');
 		    $volid = PVE::Storage::vdisk_alloc(
-			$storecfg, $storeid, $vmid, "raw", "any", $size);
+			$storecfg, $storeid, $vmid, "raw", "images", $size);
 		} else {
 		    $volid = PVE::Storage::vdisk_alloc(
-			$storecfg, $storeid, $vmid, $fmt, "any", $size);
+			$storecfg, $storeid, $vmid, $fmt, "images", $size);
 		}
 
 		# change created disk to a base volume in case the VM is a template
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 4fb8bff0..060c2b5b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8620,7 +8620,7 @@ sub create_efidisk($$$$$$$$) {
 
     my $vars_size_b = -s $ovmf_vars;
     my $vars_size = PVE::Tools::convert_size($vars_size_b, 'b' => 'kb');
-    my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, 'any', $vars_size);
+    my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, 'images', $vars_size);
     PVE::Storage::activate_volumes($storecfg, [$volid]);
 
     qemu_img_convert($ovmf_vars, $volid, $vars_size_b);
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 3c44b8fb..4f416835 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -45,7 +45,7 @@ sub commit_cloudinit_disk {
 	my $name = $1;
 	$size = 4 * 1024;
 	PVE::Storage::vdisk_alloc(
-	    $storecfg, $storeid, $vmid, $format, 'any', $size, { name => $name });
+	    $storecfg, $storeid, $vmid, $format, 'images', $size, { name => $name });
 	$size *= 1024; # vdisk alloc takes KB, qemu-img dd's osize takes byte
     }
     my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-- 
2.39.5