forked from pool/dmidecode
925fc78f0a
Add "--no-sysfs" option description to -h output. - dmidecode-02-fix-no-smbios-nor-dmi-entry-point-found-on-smbios3.patch: Fix 'No SMBIOS nor DMI entry point found' on SMBIOS3. - dmidecode-03-let-read_file-return-the-actual-data-size.patch: Let read_file return the actual data size. - dmidecode-04-use-read_file-to-read-the-dmi-table-from-sysfs.patch: Use read_file() to read the DMI table from sysfs. https://savannah.nongnu.org/bugs/?46176 - dmidecode-05-use-dword-for-structure-table-maximum-size-in-smbios3.patch: Use DWORD for Structure table maximum size in SMBIOS3. - dmidecode-06-hide-irrelevant-fixup-message.patch: Hide irrelevant fixup message. http://savannah.nongnu.org/support/?109024 OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=35
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From: Xie XiuQi <xiexiuqi@huawei.com>
|
|
Date: Wed, 21 Oct 2015 15:12:50 +0200
|
|
Subject: Fix 'No SMBIOS nor DMI entry point found' on SMBIOS3
|
|
Git-commit: bf7bad24ce141dab5b5acc3ffb98ce5fe4a8e0f9
|
|
|
|
address_from_efi may return a SMBIOS or SMBIOS3 format entry
|
|
point, so add this condition.
|
|
|
|
---
|
|
AUTHORS | 1 +
|
|
dmidecode.c | 12 ++++++++++--
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
--- dmidecode-3.0.orig/AUTHORS 2016-05-03 16:05:03.118840743 +0200
|
|
+++ dmidecode-3.0/AUTHORS 2016-05-03 16:05:07.803884342 +0200
|
|
@@ -19,6 +19,7 @@ Jarod Wilson <jarod@redhat.com>
|
|
Anton Arapov <anton@redhat.com>
|
|
Roy Franz <roy.franz@linaro.org>
|
|
Tyler Bell <tyler.bell@hp.com>
|
|
+Xie XiuQi <xiexiuqi@huawei.com>
|
|
|
|
MANY THANKS TO (IN CHRONOLOGICAL ORDER)
|
|
Werner Heuser
|
|
--- dmidecode-3.0.orig/dmidecode.c 2016-05-03 16:05:03.118840743 +0200
|
|
+++ dmidecode-3.0/dmidecode.c 2016-05-03 16:05:07.804884352 +0200
|
|
@@ -4864,8 +4864,16 @@ int main(int argc, char * const argv[])
|
|
goto exit_free;
|
|
}
|
|
|
|
- if (smbios_decode(buf, opt.devmem, 0))
|
|
- found++;
|
|
+ if (memcmp(buf, "_SM3_", 5) == 0)
|
|
+ {
|
|
+ if (smbios3_decode(buf, opt.devmem, 0))
|
|
+ found++;
|
|
+ }
|
|
+ else if (memcmp(buf, "_SM_", 4) == 0)
|
|
+ {
|
|
+ if (smbios_decode(buf, opt.devmem, 0))
|
|
+ found++;
|
|
+ }
|
|
goto done;
|
|
|
|
memory_scan:
|