From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 3CFC41FF0AB for ; Wed, 23 Sep 2026 17:17:25 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id DCFC221780; Wed, 23 Sep 2026 17:16:40 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v2 50/50] pve8to9: use helper from common storage module to get vtype subdir Date: Wed, 23 Sep 2026 17:16:10 +0200 Message-ID: <20260923151611.544333-7-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260923151611.544333-1-m.carrara@proxmox.com> References: <20260923150606.531239-1-m.carrara@proxmox.com> <20260923151611.544333-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1790176584287 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.364 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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 Message-ID-Hash: 3YAFJGDLZNVKFHHYE6JPMSO54DIMS37X X-Message-ID-Hash: 3YAFJGDLZNVKFHHYE6JPMSO54DIMS37X X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Use the `plugin_get_vtype_subdir()` helper from `PVE::Storage::Common` to obtain the sub-directory for the provided content type (vtype), instead of the now deprecated `get_subdir()` method. Signed-off-by: Max R. Carrara --- PVE/CLI/pve8to9.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm index 97d564bd..a139eeca 100644 --- a/PVE/CLI/pve8to9.pm +++ b/PVE/CLI/pve8to9.pm @@ -23,6 +23,7 @@ use PVE::Network; use PVE::NodeConfig; use PVE::RPCEnvironment; use PVE::Storage; +use PVE::Storage::Common; use PVE::Storage::Plugin; use PVE::Tools qw(run_command split_list file_get_contents trim); use PVE::QemuConfig; @@ -1269,9 +1270,9 @@ sub check_storage_content_dirs { } my $resolved_subdirs = {}; - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); for my $vtype (keys $scfg->{content}->%*) { - my $abs_subdir = Cwd::abs_path($plugin->get_subdir($scfg, $vtype)); + my $abs_subdir = + Cwd::abs_path(PVE::Storage::Common::plugin_get_vtype_subdir($scfg, $vtype)); next if !defined($abs_subdir); push $resolved_subdirs->{$abs_subdir}->@*, $vtype; } -- 2.47.3