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 D54EE1FF17A for ; Tue, 6 Aug 2024 14:22:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B36E21CE3E; Tue, 6 Aug 2024 14:22:07 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 6 Aug 2024 14:21:59 +0200 Message-Id: <20240806122203.2266054-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240806122203.2266054-1-d.csapak@proxmox.com> References: <20240806122203.2266054-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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sysfstools.pm] Subject: [pve-devel] [PATCH common 2/2] SysFSTools: lscpi: move mdev and iommugroup check outside of verbose 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" they should not be expensive (only reading/file checking in sysfs; the parsed vendor/id names are not required) so we should include them always. We need at least the mdev part later at a point where we're not interested in the rest of the verbose mode. Signed-off-by: Dominik Csapak --- best viewed with -w src/PVE/SysFSTools.pm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm index 25b2f31..0bde6d7 100644 --- a/src/PVE/SysFSTools.pm +++ b/src/PVE/SysFSTools.pm @@ -103,21 +103,21 @@ sub lspci { return; } - if ($verbose) { - $res->{iommugroup} = -1; - if (-e "$devdir/iommu_group") { - my ($iommugroup) = (readlink("$devdir/iommu_group") =~ m/\/(\d+)$/); - $res->{iommugroup} = int($iommugroup); - } + $res->{iommugroup} = -1; + if (-e "$devdir/iommu_group") { + my ($iommugroup) = (readlink("$devdir/iommu_group") =~ m/\/(\d+)$/); + $res->{iommugroup} = int($iommugroup); + } - if (-d "$devdir/mdev_supported_types") { - $res->{mdev} = 1; - } elsif (-d "$devdir/nvidia") { - # nvidia driver for kernel 6.8 or higher - $res->{mdev} = 1; # for api compatibility - $res->{nvidia} = 1; - } + if (-d "$devdir/mdev_supported_types") { + $res->{mdev} = 1; + } elsif (-d "$devdir/nvidia") { + # nvidia driver for kernel 6.8 or higher + $res->{mdev} = 1; # for api compatibility + $res->{nvidia} = 1; + } + if ($verbose) { my $device_hash = $ids->{$vendor}->{devices}->{$device} // {}; my $sub_vendor = file_read_firstline("$devdir/subsystem_vendor"); -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel