From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D27B21FF16F for <inbox@lore.proxmox.com>; Tue, 15 Apr 2025 15:51:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD2BF949D; Tue, 15 Apr 2025 15:50:58 +0200 (CEST) From: Daniel Kral <d.kral@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 15 Apr 2025 15:50:21 +0200 Message-Id: <20250415135045.255272-4-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250415135045.255272-1-d.kral@proxmox.com> References: <20250415135045.255272-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage v3 3/4] vdisk_alloc: factor out optional parameters in options hash argument X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Move the optional parameter `name` into an optional hash argument at the end of the subroutine signature of vdisk_alloc(). This allows to add more optional arguments in the future and makes the function call easier to follow when a name is not required. This requires a versioned break for packages that call vdisk_alloc(), which are currently qemu-server and pve-container. Signed-off-by: Daniel Kral <d.kral@proxmox.com> --- changes since v2: * wrap 100+ char lines correctly * add $fmt back as a required parameter as it didn't make sense to have it be optional because of only a few places src/PVE/API2/Storage/Content.pm | 5 ++--- src/PVE/GuestImport.pm | 2 +- src/PVE/Storage.pm | 32 ++++++++++++++++++++++++++++-- src/test/run_test_zfspoolplugin.pl | 8 ++++---- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/PVE/API2/Storage/Content.pm b/src/PVE/API2/Storage/Content.pm index 8fbfbe9..64ed56d 100644 --- a/src/PVE/API2/Storage/Content.pm +++ b/src/PVE/API2/Storage/Content.pm @@ -218,9 +218,8 @@ __PACKAGE__->register_method ({ my $cfg = PVE::Storage::config(); - my $volid = PVE::Storage::vdisk_alloc ($cfg, $storeid, $param->{vmid}, - $param->{format}, - $name, $size); + my $volid = PVE::Storage::vdisk_alloc( + $cfg, $storeid, $param->{vmid}, $param->{format}, $size, { name => $name }); return $volid; }}); diff --git a/src/PVE/GuestImport.pm b/src/PVE/GuestImport.pm index 16099ca..76ebc9d 100644 --- a/src/PVE/GuestImport.pm +++ b/src/PVE/GuestImport.pm @@ -69,7 +69,7 @@ sub extract_disk_from_import_file { # create temporary 1M image that will get overwritten by the rename # to reserve the filename and take care of locking - $target_volid = PVE::Storage::vdisk_alloc($cfg, $target_storeid, $vmid, $inner_fmt, undef, 1024); + $target_volid = PVE::Storage::vdisk_alloc($cfg, $target_storeid, $vmid, $inner_fmt, 1024); $target_path = PVE::Storage::path($cfg, $target_volid); print "renaming $source_path to $target_path\n"; diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index eea51e9..ab4dcdd 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1056,8 +1056,36 @@ sub unmap_volume { return $plugin->unmap_volume($storeid, $scfg, $volname, $snapname); } -sub vdisk_alloc { - my ($cfg, $storeid, $vmid, $fmt, $name, $size) = @_; +=head3 vdisk_alloc($cfg, $storeid, $vmid, $fmt, $size [, %opts]) + +Allocates a volume on the storage with the identifier C<$storeid> (defined in +the storage config C<$cfg>) for the VM with the id C<$vmid> with format C<$fmt> +and a size of C<$size> kilobytes. + +The format C<$fmt> can be C<'raw'>, C<'qcow2'>, C<'subvol'> or C<'vmdk'>. If +C<$fmt> is left undefined, it will fallback on the default format of the storage +type of C<$storeid>. + +Optionally, the following key-value pairs are available for C<%opts>: + +=over + +=item * C<< $name => $string >> + +Specifies the name of the new volume. + +If undefined, the name will be automatically generated. + +=back + +Returns the identifier for the new volume in the format C<"$storeid:$volname">. + +=cut + +sub vdisk_alloc : prototype($$$$$;%) { + my ($cfg, $storeid, $vmid, $fmt, $size, $opts) = @_; + + my $name = $opts->{name}; die "no storage ID specified\n" if !$storeid; diff --git a/src/test/run_test_zfspoolplugin.pl b/src/test/run_test_zfspoolplugin.pl index 095ccb3..7dd0a2b 100755 --- a/src/test/run_test_zfspoolplugin.pl +++ b/src/test/run_test_zfspoolplugin.pl @@ -565,7 +565,7 @@ my $test13 = sub { print "\nrun test13 \"vdisk_alloc\"\n"; eval { - my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", undef ,1024 * 1024); + my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", 1024 * 1024); if ($tmp_volid ne "$storagename:vm-112-disk-0") { die "volname:$tmp_volid don't match\n"; @@ -589,7 +589,7 @@ my $test13 = sub { } eval { - my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", undef ,2048 * 1024); + my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "112", "raw", 2048 * 1024); if ($tmp_volid ne "$storagename:vm-112-disk-1") { die "volname:$tmp_volid don't match\n"; @@ -613,7 +613,7 @@ my $test13 = sub { } eval { - my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "113", "subvol", undef ,1024 * 1024); + my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "113", "subvol", 1024 * 1024); if ($tmp_volid ne "$storagename:subvol-113-disk-0") { die "volname:$tmp_volid don't match\n"; @@ -637,7 +637,7 @@ my $test13 = sub { } eval { - my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "113", "subvol", undef ,2048 * 1024); + my $tmp_volid = PVE::Storage::vdisk_alloc($cfg, $storagename, "113", "subvol", 2048 * 1024); if ($tmp_volid ne "$storagename:subvol-113-disk-1") { die "volname:$tmp_volid don't match\n"; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel