From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id DF2801FF15E for ; Tue, 11 Feb 2025 17:09:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A3D1C34A8; Tue, 11 Feb 2025 17:08:46 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Tue, 11 Feb 2025 17:08:15 +0100 Message-Id: <20250211160825.254167-22-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211160825.254167-1-d.kral@proxmox.com> References: <20250211160825.254167-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 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 container v2 01/11] migration: prepare: factor out common read-only variables 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Factor out the common read-only variables to allow the second call to `storage_check_enabled` to be below 100 characters. Signed-off-by: Daniel Kral --- changes since v1: - new! src/PVE/LXC/Migrate.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index e1e6cab..f06a10a 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -71,7 +71,8 @@ sub prepare { die "can't determine assigned storage for mount point '$ms'\n" if !$storage; # check if storage is available on both nodes - my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $storage); + my ($storecfg, $node) = $self->@{qw(storecfg node)}; + my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storage); my $targetsid = $storage; @@ -92,7 +93,7 @@ sub prepare { } if (!$remote) { - my $target_scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $targetsid, $self->{node}); + my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $node); die "$volid: content type 'rootdir' is not available on storage '$targetsid'\n" if !$target_scfg->{content}->{rootdir}; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel