[pve-devel] [PATCH qemu-server v3 10/12] api: qmrestore: 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 and
CLI handler for restoring VMs to a specified target storage.

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/QemuServer.pm | 13 +++++--------
 qmextract         |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 060c2b5b..ed207192 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6687,11 +6687,10 @@ my $parse_backup_hints = sub {
     my ($rpcenv, $user, $storecfg, $fh, $devinfo, $options) = @_;
 
     my $check_storage = sub { # assert if an image can be allocate
-	my ($storeid, $scfg) = @_;
-	die "Content type 'images' is not available on storage '$storeid'\n"
-	    if !$scfg->{content}->{images};
+	my ($storeid) = @_;
 	$rpcenv->check($user, "/storage/$storeid", ['Datastore.AllocateSpace'])
 	    if $user ne 'root at pam';
+	PVE::Storage::assert_content_type_available($storecfg, $storeid, 'images');
     };
 
     my $virtdev_hash = {};
@@ -6712,8 +6711,7 @@ my $parse_backup_hints = sub {
 	    $devinfo->{$devname}->{format} = $format;
 	    $devinfo->{$devname}->{storeid} = $storeid;
 
-	    my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
-	    $check_storage->($storeid, $scfg); # permission and content type check
+	    $check_storage->($storeid); # permission and content type check
 
 	    $virtdev_hash->{$virtdev} = $devinfo->{$devname};
 	} elsif ($line =~ m/^((?:ide|sata|scsi)\d+):\s*(.*)\s*$/) {
@@ -6723,10 +6721,9 @@ my $parse_backup_hints = sub {
 	    if (drive_is_cloudinit($drive)) {
 		my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file});
 		$storeid = $options->{storage} if defined ($options->{storage});
-		my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
 		my $format = eval { checked_volume_format($storecfg, $drive->{file}) } // 'raw';
 
-		$check_storage->($storeid, $scfg); # permission and content type check
+		$check_storage->($storeid); # permission and content type check
 
 		$virtdev_hash->{$virtdev} = {
 		    format => $format,
@@ -6773,7 +6770,7 @@ my $restore_allocate_devices = sub {
 	}
 
 	my $volid = PVE::Storage::vdisk_alloc(
-	    $storecfg, $storeid, $vmid, $d->{format}, 'any', $alloc_size, { name => $name });
+	    $storecfg, $storeid, $vmid, $d->{format}, 'images', $alloc_size, { name => $name });
 
 	print STDERR "new volume ID is '$volid'\n";
 	$d->{volid} = $volid;
diff --git a/qmextract b/qmextract
index b8f874f9..762fea0b 100755
--- a/qmextract
+++ b/qmextract
@@ -174,7 +174,8 @@ sub extract_archive {
 		if $format ne 'raw';
 	}
 
-	my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid, $format, 'any', $alloc_size);
+	my $volid = PVE::Storage::vdisk_alloc(
+	    $cfg, $storeid, $vmid, $format, 'images', $alloc_size);
 
 	print STDERR "new volume ID is '$volid'\n";
 
-- 
2.39.5