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 CF86289449 for ; Fri, 12 Aug 2022 09:25:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C22EE2702D for ; Fri, 12 Aug 2022 09:25:27 +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 ; Fri, 12 Aug 2022 09:25:26 +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 68F2E434E6 for ; Fri, 12 Aug 2022 09:25:26 +0200 (CEST) Date: Fri, 12 Aug 2022 09:25:25 +0200 From: Wolfgang Bumiller To: Dominik Csapak Cc: pve-devel@lists.proxmox.com Message-ID: <20220812072525.bwjaadekffkjualp@casey.proxmox.com> References: <20220726065559.674547-1-d.csapak@proxmox.com> <20220726065559.674547-2-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220726065559.674547-2-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.278 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 - 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: Re: [pve-devel] [PATCH common 1/1] SysFSTools: get name from mediated device types 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: Fri, 12 Aug 2022 07:25:27 -0000 On Tue, Jul 26, 2022 at 08:55:57AM +0200, Dominik Csapak wrote: > Some vendors also provide a 'name' file here for the type, which, in case of > NVIDIA, is the official name for the vGPU type in their documentation, > so extract and return it too (if it exists). > > Signed-off-by: Dominik Csapak > --- > src/PVE/SysFSTools.pm | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm > index ac48f2c..e897b22 100644 > --- a/src/PVE/SysFSTools.pm > +++ b/src/PVE/SysFSTools.pm > @@ -172,11 +172,15 @@ sub get_mdev_types { > my $available = int(file_read_firstline("$type_path/available_instances")); > my $description = PVE::Tools::file_get_contents("$type_path/description"); > > - push @$types, { > + my $entry = { > type => $type, > description => $description, > available => $available, > }; > + > + $entry->{name} = PVE::Tools::file_get_contents("$type_path/name") if -e "$type_path/name"; Since this is a sysfs file I'd expect this to end in a newline? Otherwise this is fine, though I'm not a fan of `-e` checks in general. You could use `file_read_firstline` which would `chomp` the newline and return `undef` if opening the file fails (and you could then (maybe optionally) check `$!` for `ENOENT`). > + > + push @$types, $entry; > }); > > return $types; > -- > 2.30.2