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 607CB1FF396 for ; Thu, 6 Jun 2024 11:31:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E726AB7F2; Thu, 6 Jun 2024 11:31:56 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:22:14 +0200 Message-Id: <20240606092220.1190913-20-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 manager v4 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: , 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" by also providing the global config in assert_valid, and by also adding the mdev config in the 'toCheck' object in the gui For the gui, we extract the mdev property from the global entry, and add it to the individual mapping entries, that way we can reuse the checking logic of the other properties. Signed-off-by: Dominik Csapak --- changes from v3: * give mdev a default value, to make the error nicer PVE/API2/Cluster/Mapping/PCI.pm | 2 +- www/manager6/dc/PCIMapView.js | 6 ++++++ 2 files changed, 7 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..f9d43aa2 100644 --- a/www/manager6/dc/PCIMapView.js +++ b/www/manager6/dc/PCIMapView.js @@ -20,10 +20,15 @@ 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 ?? 0; + } if (rec.data.node !== node || rec.data.type !== 'map') { return; } + rec.data.mdev = mdev; let id = rec.data.path; if (!id.match(/\.\d$/)) { @@ -44,6 +49,7 @@ Ext.define('PVE.dc.PCIMapView', { let toCheck = { id: deviceId, 'subsystem-id': subId, + mdev: device.mdev ?? 0, iommugroup: device.iommugroup !== -1 ? device.iommugroup : undefined, }; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel