From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9ED561FF380 for ; Fri, 19 Apr 2024 14:47:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3A7488D4A; Fri, 19 Apr 2024 14:46:30 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 19 Apr 2024 14:45:37 +0200 Message-Id: <20240419124556.3334691-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419124556.3334691-1-d.csapak@proxmox.com> References: <20240419124556.3334691-1-d.csapak@proxmox.com> MIME-Version: 1.0 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 v3 2/4] mapping: pci: check the mdev configuration on the device too 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" but that lives int he 'global' part of the mapping config, not in a specific mapping. To check that, add it to the $configured_props from there. this requires all call sites to be adapted otherwise the check will always fail for devices that are capable of mediated devices Signed-off-by: Dominik Csapak --- changes from v2: * adapt to changes of previous patch src/PVE/Mapping/PCI.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PVE/Mapping/PCI.pm b/src/PVE/Mapping/PCI.pm index ef1bd8d..b412c4d 100644 --- a/src/PVE/Mapping/PCI.pm +++ b/src/PVE/Mapping/PCI.pm @@ -131,7 +131,7 @@ sub options { # checks if the given config is valid for the current node sub assert_valid { - my ($name, $mapping) = @_; + my ($name, $mapping, $cfg) = @_; my @paths = split(';', $mapping->{path} // ''); @@ -151,6 +151,7 @@ sub assert_valid { my $expected_props = { id => "$info->{vendor}:$info->{device}", iommugroup => $info->{iommugroup}, + mdev => $info->{mdev}, }; if (defined($info->{'subsystem_vendor'}) && defined($info->{'subsystem_device'})) { @@ -158,6 +159,8 @@ sub assert_valid { } my $configured_props = { $mapping->%{qw(id iommugroup subsystem-id)} }; + # check mdev from globabl mapping config + $configured_props->{mdev} = $cfg->{mdev}; my $merged = { %$expected_props, %$configured_props }; # just for the keys for my $prop (sort keys %$merged) { -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel