Blame SOURCES/0005-Fix-No-SMBIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch

fd304b
From bf7bad24ce141dab5b5acc3ffb98ce5fe4a8e0f9 Mon Sep 17 00:00:00 2001
fd304b
From: Xie XiuQi <xiexiuqi@huawei.com>
fd304b
Date: Wed, 21 Oct 2015 15:12:50 +0200
fd304b
Subject: [PATCH 5/9] Fix 'No SMBIOS nor DMI entry point found' on SMBIOS3
fd304b
fd304b
address_from_efi may return a SMBIOS or SMBIOS3 format entry
fd304b
point, so add this condition.
fd304b
---
fd304b
 AUTHORS     |  1 +
fd304b
 CHANGELOG   |  4 ++++
fd304b
 dmidecode.c | 12 ++++++++++--
fd304b
 3 files changed, 15 insertions(+), 2 deletions(-)
fd304b
fd304b
diff --git a/AUTHORS b/AUTHORS
fd304b
index d4badfa..ccf7fbb 100644
fd304b
--- a/AUTHORS
fd304b
+++ b/AUTHORS
fd304b
@@ -19,6 +19,7 @@ Jarod Wilson <jarod@redhat.com>
fd304b
 Anton Arapov <anton@redhat.com>
fd304b
 Roy Franz <roy.franz@linaro.org>
fd304b
 Tyler Bell <tyler.bell@hp.com>
fd304b
+Xie XiuQi <xiexiuqi@huawei.com>
fd304b
 
fd304b
 MANY THANKS TO (IN CHRONOLOGICAL ORDER)
fd304b
 Werner Heuser
fd304b
diff --git a/CHANGELOG b/CHANGELOG
fd304b
index 2aa1082..be2092a 100644
fd304b
--- a/CHANGELOG
fd304b
+++ b/CHANGELOG
fd304b
@@ -1,3 +1,7 @@
fd304b
+2015-10-21  Xie XiuQi  <xiexiuqi@huawei.com>
fd304b
+
fd304b
+	* dmidecode.c: Handle SMBIOS 3.0 entry points on EFI systems.
fd304b
+
fd304b
 2015-10-20  Jean Delvare  <jdelvare@suse.de>
fd304b
 
fd304b
 	* dmidecode.c: Handle OEM-specific types in group associations
fd304b
diff --git a/dmidecode.c b/dmidecode.c
fd304b
index ce0511b..cfcade4 100644
fd304b
--- a/dmidecode.c
fd304b
+++ b/dmidecode.c
fd304b
@@ -4866,8 +4866,16 @@ int main(int argc, char * const argv[])
fd304b
 		goto exit_free;
fd304b
 	}
fd304b
 
fd304b
-	if (smbios_decode(buf, opt.devmem, 0))
fd304b
-		found++;
fd304b
+	if (memcmp(buf, "_SM3_", 5) == 0)
fd304b
+	{
fd304b
+		if (smbios3_decode(buf, opt.devmem, 0))
fd304b
+			found++;
fd304b
+	}
fd304b
+	else if (memcmp(buf, "_SM_", 4) == 0)
fd304b
+	{
fd304b
+		if (smbios_decode(buf, opt.devmem, 0))
fd304b
+			found++;
fd304b
+	}
fd304b
 	goto done;
fd304b
 
fd304b
 memory_scan:
fd304b
-- 
fd304b
2.5.0
fd304b