[pve-devel] [PATCH qemu-server v2 08/15] tree-wide: update vdisk_alloc optional arguments signature

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

Update any callers of `PVE::Storage::vdisk_alloc` to the updated
function signature, which moves the optional arguments `$fmt` and
`$name` (as these may be passed as undefined), to the optional hash
argument at the end of the argument list.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes since v1:
- update `vdisk_alloc` instead of creating `alloc_volume_disk`

 PVE/API2/Qemu.pm             |  8 +++++---
 PVE/QemuConfig.pm            |  4 +++-
 PVE/QemuServer.pm            | 15 ++++++++-------
 PVE/QemuServer/Cloudinit.pm  |  4 +++-
 PVE/QemuServer/ImportDisk.pm |  3 ++-
 PVE/VZDump/QemuServer.pm     |  4 +++-
 qmextract                    |  3 +--
 test/MigrationTest/QmMock.pm |  4 ++--
 8 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 9fadf3e5..92d24443 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -414,7 +414,9 @@ 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, $name, $ci_size/1024);
+	    my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, $ci_size/1024, {
+		name => $name,
+	    });
 	    $disk->{file} = $volid;
 	    $disk->{media} = 'cdrom';
 	    push @$vollist, $volid;
@@ -552,9 +554,9 @@ 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", undef, $size);
+		    $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, 'raw', $size);
 		} else {
-		    $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size);
+		    $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, $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 ffdf9f03..45660abb 100644
--- a/PVE/QemuConfig.pm
+++ b/PVE/QemuConfig.pm
@@ -226,7 +226,9 @@ sub __snapshot_save_vmstate {
     my $name = "vm-$vmid-state-$snapname";
     $name .= ".raw" if $scfg->{path}; # add filename extension for file base storage
 
-    my $statefile = PVE::Storage::vdisk_alloc($storecfg, $target, $vmid, 'raw', $name, $size*1024);
+    my $statefile = PVE::Storage::vdisk_alloc($storecfg, $target, $vmid, 'raw', $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 808c0e1c..2f14bb52 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5471,7 +5471,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, undef, $size);
+	my $newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $size);
 	my $newdrive = $drive;
 	$newdrive->{format} = $format;
 	$newdrive->{file} = $newvolid;
@@ -6684,8 +6684,9 @@ my $restore_allocate_devices = sub {
 	    }
 	}
 
-	my $volid = PVE::Storage::vdisk_alloc(
-	    $storecfg, $storeid, $vmid, $d->{format}, $name, $alloc_size);
+	my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $d->{format}, $alloc_size, {
+	    name => $name,
+	});
 
 	print STDERR "new volume ID is '$volid'\n";
 	$d->{volid} = $volid;
@@ -8243,9 +8244,9 @@ sub clone_disk {
 
 	    $size = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 10);
 	}
-	$newvolid = PVE::Storage::vdisk_alloc(
-	    $storecfg, $storeid, $newvmid, $dst_format, $name, ($size/1024)
-	);
+	$newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, ($size/1024), {
+	    name => $name,
+	});
 	push @$newvollist, $newvolid;
 
 	PVE::Storage::activate_volumes($storecfg, [$newvolid]);
@@ -8368,7 +8369,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, undef, $vars_size);
+    my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, $vars_size);
     PVE::Storage::activate_volumes($storecfg, [$volid]);
 
     qemu_img_convert($ovmf_vars, $volid, $vars_size_b, undef, 0);
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index f1143aeb..0dc99e05 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -44,7 +44,9 @@ sub commit_cloudinit_disk {
 	$volname =~ m/(vm-$vmid-cloudinit(.\Q$format\E)?)/;
 	my $name = $1;
 	$size = 4 * 1024;
-	PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $name, $size);
+	PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $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 30d56bae..22dbd4fc 100755
--- a/PVE/QemuServer/ImportDisk.pm
+++ b/PVE/QemuServer/ImportDisk.pm
@@ -28,7 +28,8 @@ sub do_import {
     warn "format '$format' is not supported by the target storage - using '$dst_format' instead\n"
 	if $format && $format ne $dst_format;
 
-    my $dst_volid = PVE::Storage::vdisk_alloc($storecfg, $storage_id, $vmid, $dst_format, undef, $src_size / 1024);
+    my $dst_volid = PVE::Storage::vdisk_alloc(
+	$storecfg, $storage_id, $vmid, $dst_format, $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 44b68ae9..c5c94a91 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -561,7 +561,9 @@ my sub allocate_fleecing_images {
 		my $size = PVE::Tools::convert_size($di->{size}, 'b' => 'kb');
 
 		$di->{'fleece-volid'} = PVE::Storage::vdisk_alloc(
-		    $self->{storecfg}, $fleecing_storeid, $vmid, $format, $name, $size);
+		    $self->{storecfg}, $fleecing_storeid, $vmid, $format, $size, {
+			name => $name,
+		    });
 
 		$n++;
 	    } else {
diff --git a/qmextract b/qmextract
index 1466a586..0500c0b8 100755
--- a/qmextract
+++ b/qmextract
@@ -174,8 +174,7 @@ sub extract_archive {
 		if $format ne 'raw';
 	}
 
-	my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid,
-					      $format, undef, $alloc_size);
+	my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid, $format, $alloc_size);
 
 	print STDERR "new volume ID is '$volid'\n";
 
diff --git a/test/MigrationTest/QmMock.pm b/test/MigrationTest/QmMock.pm
index fb94c58b..a3e6cd1a 100644
--- a/test/MigrationTest/QmMock.pm
+++ b/test/MigrationTest/QmMock.pm
@@ -84,10 +84,10 @@ my $disk_counter = 10;
 
 $MigrationTest::Shared::storage_module->mock(
     vdisk_alloc => sub {
-	my ($cfg, $storeid, $vmid, $fmt, $name, $size) = @_;
+	my ($cfg, $storeid, $vmid, $fmt, $size, $opts) = @_;
 
 	die "vdisk_alloc (mocked) - name is not expected to be set - implement me\n"
-	    if defined($name);
+	    if defined($opts->{name});
 
 	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