[pve-devel] [PATCH qemu-server v3 05/12] tree-wide: update vdisk_alloc vtype argument signature

[Daniel Kral <d.kral@proxmox.com>]

Update any callers of `PVE::Storage::vdisk_alloc` to the updated
function signature, which adds the required parameter `$vtype` that
asserts whether the underlying storage is available and supports the
content type.

Make all callers assert for 'any' volume type, i.e. skip the check for
now, so that the assertions can be added case-by-case.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes since v2:
  * new - the parameter was optional before and could be added
    per-patch, but now needs to be added in a single patch to not break
    API inbetween

 PVE/API2/Qemu.pm             | 8 +++++---
 PVE/QemuConfig.pm            | 2 +-
 PVE/QemuServer.pm            | 8 ++++----
 PVE/QemuServer/Cloudinit.pm  | 2 +-
 PVE/QemuServer/ImportDisk.pm | 2 +-
 PVE/VZDump/QemuServer.pm     | 9 ++++++++-
 qmextract                    | 2 +-
 test/MigrationTest/QmMock.pm | 5 ++++-
 8 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 93b0bd4d..9dc40e42 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -434,7 +434,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, $ci_size/1024, { name => $name });
+		$storecfg, $storeid, $vmid, $fmt, 'any', $ci_size/1024, { name => $name });
 	    $disk->{file} = $volid;
 	    $disk->{media} = 'cdrom';
 	    push @$vollist, $volid;
@@ -579,9 +579,11 @@ my sub create_disks : prototype($$$$$$$$$$$) {
 		} elsif ($ds eq 'tpmstate0') {
 		    # 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", $size);
+		    $volid = PVE::Storage::vdisk_alloc(
+			$storecfg, $storeid, $vmid, "raw", "any", $size);
 		} else {
-		    $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, $size);
+		    $volid = PVE::Storage::vdisk_alloc(
+			$storecfg, $storeid, $vmid, $fmt, "any", $size);
 		}
 
 		# change created disk to a base volume in case the VM is a template
diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm
index 5c052dbb..19d9785e 100644
--- a/PVE/QemuConfig.pm
+++ b/PVE/QemuConfig.pm
@@ -230,7 +230,7 @@ sub __snapshot_save_vmstate {
     $name .= ".raw" if $scfg->{path}; # add filename extension for file base storage
 
     my $statefile = PVE::Storage::vdisk_alloc(
-	$storecfg, $target, $vmid, 'raw', $size*1024, { name => $name });
+	$storecfg, $target, $vmid, 'raw', 'any', $size*1024, { name => $name });
     my $runningmachine = PVE::QemuServer::Machine::get_current_qemu_machine($vmid);
 
     # get current QEMU -cpu argument to ensure consistency of custom CPU models
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 6f19c5d1..8e6ab92f 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5527,7 +5527,7 @@ sub vm_migrate_alloc_nbd_disks {
 	$format = $defFormat if !$format || !grep { $format eq $_ } $validFormats->@*;
 
 	my $size = $drive->{size} / 1024;
-	my $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $size);
+	my $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, 'any', $size);
 	my $newdrive = $drive;
 	$newdrive->{format} = $format;
 	$newdrive->{file} = $newvolid;
@@ -6771,7 +6771,7 @@ my $restore_allocate_devices = sub {
 	}
 
 	my $volid = PVE::Storage::vdisk_alloc(
-	    $storecfg, $storeid, $vmid, $d->{format}, $alloc_size, { name => $name });
+	    $storecfg, $storeid, $vmid, $d->{format}, 'any', $alloc_size, { name => $name });
 
 	print STDERR "new volume ID is '$volid'\n";
 	$d->{volid} = $volid;
@@ -8489,7 +8489,7 @@ sub clone_disk {
 	    $size = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 10);
 	}
 	$newvolid = PVE::Storage::vdisk_alloc(
-	    $storecfg, $storeid, $newvmid, $dst_format, ($size/1024), { name => $name });
+	    $storecfg, $storeid, $newvmid, $dst_format, 'any', ($size/1024), { name => $name });
 	push @$newvollist, $newvolid;
 
 	PVE::Storage::activate_volumes($storecfg, [$newvolid]);
@@ -8618,7 +8618,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, $vars_size);
+    my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, 'any', $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 6e2c706b..3c44b8fb 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, $size, { name => $name });
+	    $storecfg, $storeid, $vmid, $format, 'any', $size, { name => $name });
 	$size *= 1024; # vdisk alloc takes KB, qemu-img dd's osize takes byte
     }
     my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
diff --git a/PVE/QemuServer/ImportDisk.pm b/PVE/QemuServer/ImportDisk.pm
index d369a5e5..7dc25626 100755
--- a/PVE/QemuServer/ImportDisk.pm
+++ b/PVE/QemuServer/ImportDisk.pm
@@ -29,7 +29,7 @@ sub do_import {
 	if $format && $format ne $dst_format;
 
     my $dst_volid = PVE::Storage::vdisk_alloc(
-	$storecfg, $storage_id, $vmid, $dst_format, $src_size / 1024);
+	$storecfg, $storage_id, $vmid, $dst_format, 'any', $src_size / 1024);
 
     my $zeroinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $dst_volid);
 
diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 650b6643..b4bac3f9 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -593,7 +593,14 @@ my sub allocate_fleecing_images {
 		}
 
 		$di->{'fleece-volid'} = PVE::Storage::vdisk_alloc(
-		    $self->{storecfg}, $fleecing_storeid, $vmid, $format, $size, { name => $name });
+		    $self->{storecfg},
+		    $fleecing_storeid,
+		    $vmid,
+		    $format,
+		    'any',
+		    $size,
+		    { name => $name }
+		);
 
 		push $fleece_volids->@*, $di->{'fleece-volid'};
 
diff --git a/qmextract b/qmextract
index 0500c0b8..b8f874f9 100755
--- a/qmextract
+++ b/qmextract
@@ -174,7 +174,7 @@ sub extract_archive {
 		if $format ne 'raw';
 	}
 
-	my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid, $format, $alloc_size);
+	my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid, $format, 'any', $alloc_size);
 
 	print STDERR "new volume ID is '$volid'\n";
 
diff --git a/test/MigrationTest/QmMock.pm b/test/MigrationTest/QmMock.pm
index a3e6cd1a..dfe06667 100644
--- a/test/MigrationTest/QmMock.pm
+++ b/test/MigrationTest/QmMock.pm
@@ -84,11 +84,14 @@ my $disk_counter = 10;
 
 $MigrationTest::Shared::storage_module->mock(
     vdisk_alloc => sub {
-	my ($cfg, $storeid, $vmid, $fmt, $size, $opts) = @_;
+	my ($cfg, $storeid, $vmid, $fmt, $vtype, $size, $opts) = @_;
 
 	die "vdisk_alloc (mocked) - name is not expected to be set - implement me\n"
 	    if defined($opts->{name});
 
+	die "vdisk_alloc (mocked) - vtype is expected to be either any or images\n"
+	    if $vtype !~ m/(any|images)/;
+
 	my $name_without_extension = "vm-${vmid}-disk-${disk_counter}";
 	$disk_counter++;
 
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel