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 21FC91FF396 for ; Thu, 6 Jun 2024 11:22:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12BE5ADF7; Thu, 6 Jun 2024 11:22:54 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:21:56 +0200 Message-Id: <20240606092220.1190913-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com> References: <20240606092220.1190913-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH guest-common v4 1/6] mapping: pci: assert_valid: rename cfg to mapping 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" to make it clearer what it actually is. Also we want to add the 'real' config as parameter too, and so it's less confusing. Signed-off-by: Dominik Csapak --- split out in v4 src/PVE/Mapping/PCI.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PVE/Mapping/PCI.pm b/src/PVE/Mapping/PCI.pm index 725e106..3fba0c4 100644 --- a/src/PVE/Mapping/PCI.pm +++ b/src/PVE/Mapping/PCI.pm @@ -131,9 +131,9 @@ sub options { # checks if the given config is valid for the current node sub assert_valid { - my ($name, $cfg) = @_; + my ($name, $mapping) = @_; - my @paths = split(';', $cfg->{path} // ''); + my @paths = split(';', $mapping->{path} // ''); my $idx = 0; for my $path (@paths) { @@ -160,15 +160,15 @@ sub assert_valid { for my $prop (sort keys %$correct_props) { next if $prop eq 'iommugroup' && $idx > 0; # check iommu only on the first device - next if !defined($correct_props->{$prop}) && !defined($cfg->{$prop}); + next if !defined($correct_props->{$prop}) && !defined($mapping->{$prop}); die "no '$prop' for device '$path'\n" - if defined($correct_props->{$prop}) && !defined($cfg->{$prop}); + if defined($correct_props->{$prop}) && !defined($mapping->{$prop}); die "'$prop' configured but should not be\n" - if !defined($correct_props->{$prop}) && defined($cfg->{$prop}); + if !defined($correct_props->{$prop}) && defined($mapping->{$prop}); my $correct_prop = $correct_props->{$prop}; $correct_prop =~ s/0x//g; - my $configured_prop = $cfg->{$prop}; + my $configured_prop = $mapping->{$prop}; $configured_prop =~ s/0x//g; die "'$prop' does not match for '$name' ($correct_prop != $configured_prop)\n" -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel