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 E9D106955C for ; Mon, 22 Mar 2021 15:33:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E7853257F2 for ; Mon, 22 Mar 2021 15:32:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 768DA257E3 for ; Mon, 22 Mar 2021 15:32:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 35B9E4636B for ; Mon, 22 Mar 2021 15:32:49 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 22 Mar 2021 15:32:41 +0100 Message-Id: <20210322143243.6606-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210322143243.6606-1-f.ebner@proxmox.com> References: <20210322143243.6606-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 2/4] vdisk list: allow specifying content type 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: Mon, 22 Mar 2021 14:33:20 -0000 and only scan storages that support it if specified. Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 19f675d..eaa86fb 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -932,7 +932,7 @@ sub vdisk_free { } sub vdisk_list { - my ($cfg, $storeid, $vmid, $vollist) = @_; + my ($cfg, $storeid, $vmid, $vollist, $ctype) = @_; my $ids = $cfg->{ids}; @@ -955,6 +955,7 @@ sub vdisk_list { next if $storeid && $storeid ne $sid; next if !storage_check_enabled($cfg, $sid, undef, 1); my $content = $ids->{$sid}->{content}; + next if defined($ctype) && !$content->{$ctype}; next if !($content->{rootdir} || $content->{images}); push @$storage_list, $sid; } @@ -965,7 +966,9 @@ sub vdisk_list { activate_storage_list($cfg, $storage_list, $cache); # FIXME PVE 7.0: only scan storages with the correct content types - foreach my $sid (keys %$ids) { + my $scan = defined($ctype) ? $storage_list : [ keys %{$ids} ]; + + foreach my $sid (@{$scan}) { next if $storeid && $storeid ne $sid; next if !storage_check_enabled($cfg, $sid, undef, 1); -- 2.20.1