From 9a8ba1272cfbb712c2b7486b17e9761742131a90 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Fri, 4 Jun 2021 15:49:29 +0200 Subject: [PATCH] scan volids: remove superfluous parameter The only caller that didn't use 'images' was removed as part of the migration refactoring in commit 62a4c963b824c923a4fc82a48c81d0f63ebaddae, so this is not even a breaking change as the 'PVE 7' comment might've suggested. Signed-off-by: Fabian Ebner Reviewed-by: Stefan Reiter --- PVE/QemuServer.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 25ac0524..d77981c7 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6091,11 +6091,10 @@ my $restore_destroy_volumes = sub { } }; -# FIXME For PVE 7.0, remove $content_type and always use 'images' sub scan_volids { - my ($cfg, $vmid, $content_type) = @_; + my ($cfg, $vmid) = @_; - my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid, undef, $content_type); + my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid, undef, 'images'); my $volid_hash = {}; foreach my $storeid (keys %$info) { @@ -6189,7 +6188,7 @@ sub rescan { my $cfg = PVE::Storage::config(); print "rescan volumes...\n"; - my $volid_hash = scan_volids($cfg, $vmid, 'images'); + my $volid_hash = scan_volids($cfg, $vmid); my $updatefn = sub { my ($vmid) = @_;