From: tglozar@redhat.com
To: linux-rt-users@vger.kernel.org
Cc: jkacur@redhat.com, Tomas Glozar <tglozar@redhat.com>
Subject: [PATCH] rteval: Make output work with new dmiinfo format
Date: Mon, 29 Apr 2024 10:47:20 +0200 [thread overview]
Message-ID: <20240429084720.126511-1-tglozar@redhat.com> (raw)
From: Tomas Glozar <tglozar@redhat.com>
Commit 43c45ba7 ("rteval: Implement initial dmidecode support")
re-introduced DMI information into rteval XML summary, but in a
different format, which is not correctly picked up in rteval_text.xsl
for formatting BIOS and vendor information into rteval text output.
This lead to the information not being displayed correctly:
Model: -
BIOS version: (ver: , rev :, release date: )
Modify the relevant section of rteval_text.xsl to make it understand the
new format. Also, adjust the incorrect spacing around "rev".
New output (in QEMU VM):
Model: QEMU - Standard PC (Q35 + ICH9, 2009)
BIOS version: SeaBIOS (ver: 1.16.3-1.fc39, rev: 0.0, release date: 04/01/2014)
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
---
rteval/rteval_text.xsl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/rteval/rteval_text.xsl b/rteval/rteval_text.xsl
index 1e9c0f0..2f03bda 100644
--- a/rteval/rteval_text.xsl
+++ b/rteval/rteval_text.xsl
@@ -39,18 +39,18 @@
<xsl:text> </xsl:text>
<xsl:text> Model: </xsl:text>
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/GeneralInfo/Manufacturer|HardwareInfo/GeneralInfo/ProductName"/>
- <xsl:text> - </xsl:text><xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/GeneralInfo/ProductName|HardwareInfo/GeneralInfo/ProductName"/>
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='System Information']/Field[@Name='Manufacturer']"/>
+ <xsl:text> - </xsl:text><xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='System Information']/Field[@Name='Product Name']"/>
<xsl:text> </xsl:text>
<xsl:text> BIOS version: </xsl:text>
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS|HardwareInfo/BIOS"/>
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='Vendor']"/>
<xsl:text> (ver: </xsl:text>
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS/@Version|HardwareInfo/BIOS/@Version"/>
- <xsl:text>, rev :</xsl:text>
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS/@BIOSrevision|HardwareInfo/BIOS/@BIOSrevision"/>
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='Version']"/>
+ <xsl:text>, rev: </xsl:text>
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='BIOS Revision']"/>
<xsl:text>, release date: </xsl:text>
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS/@ReleaseDate|HardwareInfo/BIOS/@ReleaseDate"/>
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='Release Date']"/>
<xsl:text>)</xsl:text>
<xsl:text> </xsl:text>
--
2.44.0
next reply other threads:[~2024-04-29 8:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 8:47 tglozar [this message]
2024-04-29 16:07 ` [PATCH] rteval: Make output work with new dmiinfo format John Kacur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240429084720.126511-1-tglozar@redhat.com \
--to=tglozar@redhat.com \
--cc=jkacur@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.