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 E4E2D93FED for ; Wed, 10 Apr 2024 13:04:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE3CCCA7B for ; Wed, 10 Apr 2024 13:04:03 +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 for ; Wed, 10 Apr 2024 13:04:02 +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 85F3643C6C for ; Wed, 10 Apr 2024 13:04:02 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 13:03:41 +0200 Message-Id: <20240410110401.2226201-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410110401.2226201-1-d.csapak@proxmox.com> References: <20240410110401.2226201-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 guest-common v2 2/5] mapping: pci: rework properties check 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: Wed, 10 Apr 2024 11:04:03 -0000 refactors the actual checking out to its own sub, so we can reuse it later Signed-off-by: Dominik Csapak --- src/PVE/Mapping/PCI.pm | 43 +++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/PVE/Mapping/PCI.pm b/src/PVE/Mapping/PCI.pm index 725e106..fcf07c0 100644 --- a/src/PVE/Mapping/PCI.pm +++ b/src/PVE/Mapping/PCI.pm @@ -129,6 +129,26 @@ sub options { }; } +my sub check_properties { + my ($correct, $configured, $path, $name) = @_; + for my $prop (sort keys %$correct) { + next if !defined($correct->{$prop}) && !defined($configured->{$prop}); + + die "no '$prop' for device '$path'\n" + if defined($correct->{$prop}) && !defined($configured->{$prop}); + die "'$prop' configured but should not be\n" + if !defined($correct->{$prop}) && defined($configured->{$prop}); + + my $correct_prop = $correct->{$prop}; + $correct_prop =~ s/0x//g; + my $configured_prop = $configured->{$prop}; + $configured_prop =~ s/0x//g; + + die "'$prop' does not match for '$name' ($correct_prop != $configured_prop)\n" + if $correct_prop ne $configured_prop; + } +} + # checks if the given config is valid for the current node sub assert_valid { my ($name, $cfg) = @_; @@ -150,30 +170,19 @@ sub assert_valid { my $correct_props = { id => "$info->{vendor}:$info->{device}", - iommugroup => $info->{iommugroup}, }; + # check iommu only on the first device + if ($idx == 0) { + $correct_props->{iommugroup} = $info->{iommugroup}; + } + if (defined($info->{'subsystem_vendor'}) && defined($info->{'subsystem_device'})) { $correct_props->{'subsystem-id'} = "$info->{'subsystem_vendor'}:$info->{'subsystem_device'}"; } - 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}); - die "no '$prop' for device '$path'\n" - if defined($correct_props->{$prop}) && !defined($cfg->{$prop}); - die "'$prop' configured but should not be\n" - if !defined($correct_props->{$prop}) && defined($cfg->{$prop}); + check_properties($correct_props, $cfg, $path, $name); - my $correct_prop = $correct_props->{$prop}; - $correct_prop =~ s/0x//g; - my $configured_prop = $cfg->{$prop}; - $configured_prop =~ s/0x//g; - - die "'$prop' does not match for '$name' ($correct_prop != $configured_prop)\n" - if $correct_prop ne $configured_prop; - } $idx++; } -- 2.39.2