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 E10D394223 for ; Wed, 10 Apr 2024 13:04:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 80F98CDAA for ; Wed, 10 Apr 2024 13:04:09 +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:06 +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 A12C243C9D for ; Wed, 10 Apr 2024 13:04:05 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 13:03:55 +0200 Message-Id: <20240410110401.2226201-17-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 manager v2 1/5] mapping: pci: include mdev in config checks 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:41 -0000 by also providing the global config in assert_valid, and by also adding the mdev config in the 'toCheck' object in the gui Signed-off-by: Dominik Csapak --- PVE/API2/Cluster/Mapping/PCI.pm | 2 +- www/manager6/dc/PCIMapView.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Cluster/Mapping/PCI.pm b/PVE/API2/Cluster/Mapping/PCI.pm index 64462d25..f85623bb 100644 --- a/PVE/API2/Cluster/Mapping/PCI.pm +++ b/PVE/API2/Cluster/Mapping/PCI.pm @@ -115,7 +115,7 @@ __PACKAGE__->register_method ({ }; } for my $mapping ($mappings->@*) { - eval { PVE::Mapping::PCI::assert_valid($id, $mapping) }; + eval { PVE::Mapping::PCI::assert_valid($id, $mapping, $entry) }; if (my $err = $@) { push $entry->{checks}->@*, { severity => 'error', diff --git a/www/manager6/dc/PCIMapView.js b/www/manager6/dc/PCIMapView.js index 80fe3c0f..777e0247 100644 --- a/www/manager6/dc/PCIMapView.js +++ b/www/manager6/dc/PCIMapView.js @@ -20,7 +20,11 @@ Ext.define('PVE.dc.PCIMapView', { data.forEach((entry) => { ids[entry.id] = entry; }); + let mdev; me.getRootNode()?.cascade(function(rec) { + if (rec.data.type === 'entry') { + mdev = rec.data.mdev; + } if (rec.data.node !== node || rec.data.type !== 'map') { return; } @@ -44,6 +48,7 @@ Ext.define('PVE.dc.PCIMapView', { let toCheck = { id: deviceId, 'subsystem-id': subId, + mdev, iommugroup: device.iommugroup !== -1 ? device.iommugroup : undefined, }; -- 2.39.2