From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 10 Dec 2020 20:17:16 +0000 (-0500)
Subject: smbios: smbios_major_version()/smbios_minor_version() helpers
X-Git-Tag: rel-1.16.0~33
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=831f1463aaf1eb27265c18ce81d312f9029c8c99;p=seabios.git

smbios: smbios_major_version()/smbios_minor_version() helpers

They new helpers will be useful when we start supporting SMBIOS
3.0 entry points.  Use the new helpers at display_uuid().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/src/fw/biostables.c b/src/fw/biostables.c
index d22ab64..10eaa36 100644
--- a/src/fw/biostables.c
+++ b/src/fw/biostables.c
@@ -324,6 +324,24 @@ void *smbios_get_tables(u32 *length)
     return NULL;
 }
 
+static int
+smbios_major_version(void)
+{
+    if (SMBios21Addr)
+        return SMBios21Addr->smbios_major_version;
+    else
+        return 0;
+}
+
+static int
+smbios_minor_version(void)
+{
+    if (SMBios21Addr)
+        return SMBios21Addr->smbios_minor_version;
+    else
+        return 0;
+}
+
 void
 display_uuid(void)
 {
@@ -344,9 +362,9 @@ display_uuid(void)
              * the encoding, but we follow dmidecode and assume big-endian
              * encoding.
              */
-            if (SMBios21Addr->smbios_major_version > 2 ||
-                (SMBios21Addr->smbios_major_version == 2 &&
-                 SMBios21Addr->smbios_minor_version >= 6)) {
+            if (smbios_major_version() > 2 ||
+                (smbios_major_version() == 2 &&
+                 smbios_minor_version() >= 6)) {
                 printf("Machine UUID"
                        " %02x%02x%02x%02x"
                        "-%02x%02x"