diff options
Diffstat (limited to 'src/hardware/LMI_ProcessorProvider.c')
| -rw-r--r-- | src/hardware/LMI_ProcessorProvider.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/hardware/LMI_ProcessorProvider.c b/src/hardware/LMI_ProcessorProvider.c index a2a0dc7..c3134c4 100644 --- a/src/hardware/LMI_ProcessorProvider.c +++ b/src/hardware/LMI_ProcessorProvider.c @@ -23,7 +23,7 @@ #include <string.h> #include <sys/utsname.h> #include "LMI_Processor.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lscpu.h" #include "procfs.h" @@ -85,7 +85,7 @@ static CMPIStatus LMI_ProcessorEnumInstances( unsigned i, j, cpus_nb = 0; char *other_family = NULL, *architecture = NULL, *cpu_name = NULL, *stepping = NULL, *error_msg = NULL, - instance_id[INSTANCE_ID_LEN]; + instance_id[BUFLEN]; short ret1, ret2; struct utsname utsname_buf; DmiProcessor *dmi_cpus = NULL; @@ -127,8 +127,8 @@ static CMPIStatus LMI_ProcessorEnumInstances( LMI_Processor_Set_SystemCreationClassName(&lmi_cpu, lmi_get_system_creation_class_name()); LMI_Processor_Set_SystemName(&lmi_cpu, lmi_get_system_name()); - LMI_Processor_Set_CreationClassName(&lmi_cpu, LMI_ORGID "_" CPU_CLASS_NAME); - LMI_Processor_Set_Caption(&lmi_cpu, CPU_CLASS_NAME); + LMI_Processor_Set_CreationClassName(&lmi_cpu, LMI_Processor_ClassName); + LMI_Processor_Set_Caption(&lmi_cpu, "Processor"); LMI_Processor_Set_Description(&lmi_cpu, "This object represents one physical processor in system."); @@ -148,8 +148,8 @@ static CMPIStatus LMI_ProcessorEnumInstances( cpu_name = dmi_cpus[i].name; enabled_cores = dmi_cpus[i].enabled_cores; stepping = dmi_cpus[i].stepping; - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CLASS_NAME ":%s", dmi_cpus[i].id); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Processor_ClassName ":%s", dmi_cpus[i].id); LMI_Processor_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); LMI_Processor_Set_Family(&lmi_cpu, family); @@ -182,8 +182,8 @@ static CMPIStatus LMI_ProcessorEnumInstances( } else { char cpu_id[LONG_INT_LEN]; snprintf(cpu_id, LONG_INT_LEN, "%u", i); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CLASS_NAME ":%s", cpu_id); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Processor_ClassName ":%s", cpu_id); cpustatus = get_cpustatus("Enabled"); enabledstate = get_enabledstate(cpustatus); if (enabledstate == LMI_Processor_EnabledState_Enabled) { |