Hardware: add cpu cores and threads fallback

If dmidecode doesn't report correct cpu cores or cpu threads, use the values
from lscpu.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/hardware/LMI_ProcessorCapabilitiesProvider.c b/src/hardware/LMI_ProcessorCapabilitiesProvider.c
index ba7b1b9..906b7c2 100644
--- a/src/hardware/LMI_ProcessorCapabilitiesProvider.c
+++ b/src/hardware/LMI_ProcessorCapabilitiesProvider.c
@@ -70,11 +70,10 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances(
 
     if (dmi_get_processors(&dmi_cpus, &dmi_cpus_nb) != 0 || dmi_cpus_nb < 1) {
         dmi_free_processors(&dmi_cpus, &dmi_cpus_nb);
-
-        if (lscpu_get_processor(&lscpu) != 0) {
-            error_msg = "Unable to get processor information.";
-            goto done;
-        }
+    }
+    if (lscpu_get_processor(&lscpu) != 0) {
+        error_msg = "Unable to get processor information.";
+        goto done;
     }
 
     if (dmi_cpus_nb > 0) {
@@ -103,7 +102,11 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances(
                     ORGID ":" ORGID "_" CPU_CAP_CLASS_NAME ":%u", i);
             snprintf(element_name, ELEMENT_NAME_LEN, "%s%u",
                     element_name_string, i);
+        }
+        if (cores < lscpu.cores) {
             cores = lscpu.cores;
+        }
+        if (threads < lscpu.threads_per_core * lscpu.cores) {
             threads = lscpu.threads_per_core * lscpu.cores;
         }
 
@@ -124,11 +127,8 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances(
     }
 
 done:
-    /* free lscpu only if it was used */
-    if (dmi_cpus_nb < 1) {
-        lscpu_free_processor(&lscpu);
-    }
     dmi_free_processors(&dmi_cpus, &dmi_cpus_nb);
+    lscpu_free_processor(&lscpu);
 
     if (error_msg) {
         KReturn2(_cb, ERR_FAILED, "%s", error_msg);