From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8C4BB751D6 for ; Fri, 4 Jun 2021 15:50:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 747D71DEC4 for ; Fri, 4 Jun 2021 15:50:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BD3C81DD8B for ; Fri, 4 Jun 2021 15:49:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 95C9546727 for ; Fri, 4 Jun 2021 15:49:50 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:29 +0200 Message-Id: <20210604134946.152720-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.019 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/3] scan volids: remove superfluous parameter X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 13:50:30 -0000 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 --- PVE/QemuServer.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 25ac052..d77981c 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) = @_; -- 2.30.2