From 28aed3c2c360b84762f76b322e9fc80bd74c036b Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Fri, 9 May 2014 17:37:40 +0200 Subject: Hardware: spring cleanup & refactor * use openlmi common library where possible * get rid of LMI_Hardware.h file * some other cosmetic changes --- .../LMI_AssociatedProcessorCacheMemoryProvider.c | 10 ++-- src/hardware/LMI_BaseboardContainerProvider.c | 6 +-- src/hardware/LMI_BaseboardProvider.c | 18 +++---- src/hardware/LMI_BatteryPhysicalPackageProvider.c | 10 ++-- src/hardware/LMI_BatteryProvider.c | 12 ++--- src/hardware/LMI_BatterySystemDeviceProvider.c | 4 +- .../LMI_ChassisComputerSystemPackageProvider.c | 4 +- src/hardware/LMI_ChassisProvider.c | 10 ++-- src/hardware/LMI_DiskDriveATAPortProvider.c | 14 +++--- .../LMI_DiskDriveATAProtocolEndpointProvider.c | 14 +++--- .../LMI_DiskDriveDeviceSAPImplementationProvider.c | 16 +++---- .../LMI_DiskDriveElementSoftwareIdentityProvider.c | 10 ++-- src/hardware/LMI_DiskDriveProvider.c | 10 ++-- src/hardware/LMI_DiskDriveRealizesProvider.c | 6 +-- .../LMI_DiskDriveSAPAvailableForElementProvider.c | 12 ++--- .../LMI_DiskDriveSoftwareIdentityProvider.c | 10 ++-- src/hardware/LMI_DiskDriveSystemDeviceProvider.c | 4 +- .../LMI_DiskPhysicalPackageContainerProvider.c | 6 +-- src/hardware/LMI_DiskPhysicalPackageProvider.c | 10 ++-- src/hardware/LMI_Hardware.h | 55 ---------------------- .../LMI_MemoryPhysicalPackageInConnectorProvider.c | 6 +-- src/hardware/LMI_MemoryPhysicalPackageProvider.c | 10 ++-- src/hardware/LMI_MemoryProvider.c | 6 +-- src/hardware/LMI_MemorySlotContainerProvider.c | 6 +-- src/hardware/LMI_MemorySlotProvider.c | 10 ++-- src/hardware/LMI_MemorySystemDeviceProvider.c | 4 +- src/hardware/LMI_PCIBridgeProvider.c | 34 ++++++------- src/hardware/LMI_PCIBridgeSystemDeviceProvider.c | 8 ++-- src/hardware/LMI_PCIDeviceProvider.c | 30 ++++++------ src/hardware/LMI_PCIDeviceSystemDeviceProvider.c | 8 ++-- .../LMI_PhysicalBatteryContainerProvider.c | 6 +-- src/hardware/LMI_PhysicalBatteryRealizesProvider.c | 6 +-- src/hardware/LMI_PhysicalMemoryContainerProvider.c | 6 +-- src/hardware/LMI_PhysicalMemoryProvider.c | 10 ++-- src/hardware/LMI_PhysicalMemoryRealizesProvider.c | 6 +-- src/hardware/LMI_PointingDeviceProvider.c | 10 ++-- .../LMI_PortPhysicalConnectorContainerProvider.c | 6 +-- src/hardware/LMI_PortPhysicalConnectorProvider.c | 10 ++-- src/hardware/LMI_ProcessorCacheMemoryProvider.c | 14 +++--- src/hardware/LMI_ProcessorCapabilitiesProvider.c | 18 +++---- src/hardware/LMI_ProcessorChipContainerProvider.c | 6 +-- src/hardware/LMI_ProcessorChipProvider.c | 10 ++-- src/hardware/LMI_ProcessorChipRealizesProvider.c | 6 +-- .../LMI_ProcessorElementCapabilitiesProvider.c | 14 +++--- src/hardware/LMI_ProcessorProvider.c | 16 +++---- src/hardware/LMI_ProcessorSystemDeviceProvider.c | 4 +- src/hardware/LMI_SystemSlotContainerProvider.c | 6 +-- src/hardware/LMI_SystemSlotProvider.c | 10 ++-- src/hardware/PCIDev.h | 3 -- src/hardware/dmidecode.c | 1 - src/hardware/dmidecode.h | 5 -- src/hardware/lsblk.h | 3 +- src/hardware/lscpu.c | 1 - src/hardware/lscpu.h | 5 -- src/hardware/procfs.c | 1 - src/hardware/procfs.h | 5 -- src/hardware/smartctl.h | 6 +-- src/hardware/sysfs.c | 1 - src/hardware/sysfs.h | 8 +--- src/hardware/utils.c | 4 +- src/hardware/utils.h | 4 ++ src/hardware/virt_what.c | 2 - src/hardware/virt_what.h | 2 +- 63 files changed, 247 insertions(+), 331 deletions(-) delete mode 100644 src/hardware/LMI_Hardware.h diff --git a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c index 23cf5cd..dbd022e 100644 --- a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c @@ -21,7 +21,7 @@ #include #include "LMI_AssociatedProcessorCacheMemory.h" #include "LMI_Processor.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lscpu.h" #include "sysfs.h" @@ -136,7 +136,7 @@ static CMPIStatus LMI_AssociatedProcessorCacheMemoryEnumInstances( lmi_get_system_creation_class_name()); LMI_ProcessorRef_Set_SystemName(&lmi_cpu, lmi_get_system_name()); LMI_ProcessorRef_Set_CreationClassName(&lmi_cpu, - LMI_ORGID "_" CPU_CLASS_NAME); + LMI_Processor_ClassName); LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); /* loop caches */ @@ -154,7 +154,7 @@ static CMPIStatus LMI_AssociatedProcessorCacheMemoryEnumInstances( LMI_ProcessorCacheMemoryRef_Set_SystemName(&lmi_cpu_cache, lmi_get_system_name()); LMI_ProcessorCacheMemoryRef_Set_CreationClassName( - &lmi_cpu_cache, LMI_ORGID "_" CPU_CACHE_CLASS_NAME); + &lmi_cpu_cache, LMI_ProcessorCacheMemory_ClassName); LMI_ProcessorCacheMemoryRef_Set_DeviceID( &lmi_cpu_cache, dmi_cpu_caches[j].id); @@ -218,7 +218,7 @@ static CMPIStatus LMI_AssociatedProcessorCacheMemoryEnumInstances( LMI_ProcessorCacheMemoryRef_Set_SystemName(&lmi_cpu_cache, lmi_get_system_name()); LMI_ProcessorCacheMemoryRef_Set_CreationClassName(&lmi_cpu_cache, - LMI_ORGID "_" CPU_CACHE_CLASS_NAME); + LMI_ProcessorCacheMemory_ClassName); LMI_ProcessorCacheMemoryRef_Set_DeviceID(&lmi_cpu_cache, sysfs_cpu_caches[i].id); @@ -230,7 +230,7 @@ static CMPIStatus LMI_AssociatedProcessorCacheMemoryEnumInstances( lmi_get_system_creation_class_name()); LMI_ProcessorRef_Set_SystemName(&lmi_cpu, lmi_get_system_name()); LMI_ProcessorRef_Set_CreationClassName(&lmi_cpu, - LMI_ORGID "_" CPU_CLASS_NAME); + LMI_Processor_ClassName); if (dmi_cpus_nb > 0) { LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[j].id); diff --git a/src/hardware/LMI_BaseboardContainerProvider.c b/src/hardware/LMI_BaseboardContainerProvider.c index 1ac1ff2..a0a9da7 100644 --- a/src/hardware/LMI_BaseboardContainerProvider.c +++ b/src/hardware/LMI_BaseboardContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_BaseboardContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -72,12 +72,12 @@ static CMPIStatus LMI_BaseboardContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); LMI_BaseboardRef_Init(&lmi_baseboard, _cb, ns); LMI_BaseboardRef_Set_CreationClassName(&lmi_baseboard, - LMI_ORGID "_" BASEBOARD_CLASS_NAME); + LMI_Baseboard_ClassName); if (strcmp(dmi_baseboard.serial_number, "Not Specified") == 0) { LMI_BaseboardRef_Set_Tag(&lmi_baseboard, "0"); } else { diff --git a/src/hardware/LMI_BaseboardProvider.c b/src/hardware/LMI_BaseboardProvider.c index cb3622f..daf84f1 100644 --- a/src/hardware/LMI_BaseboardProvider.c +++ b/src/hardware/LMI_BaseboardProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_Baseboard.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb = NULL; @@ -57,7 +57,7 @@ static CMPIStatus LMI_BaseboardEnumInstances( { LMI_Baseboard lmi_baseboard; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; DmiBaseboard dmi_baseboard; if (dmi_get_baseboard(&dmi_baseboard) != 0) { @@ -67,24 +67,24 @@ static CMPIStatus LMI_BaseboardEnumInstances( LMI_Baseboard_Init(&lmi_baseboard, _cb, ns); LMI_Baseboard_Set_CreationClassName(&lmi_baseboard, - LMI_ORGID "_" BASEBOARD_CLASS_NAME); + LMI_Baseboard_ClassName); LMI_Baseboard_Set_PackageType(&lmi_baseboard, LMI_Baseboard_PackageType_Cross_Connect_Backplane); - LMI_Baseboard_Set_Name(&lmi_baseboard, BASEBOARD_CLASS_NAME); - LMI_Baseboard_Set_ElementName(&lmi_baseboard, BASEBOARD_CLASS_NAME); + LMI_Baseboard_Set_Name(&lmi_baseboard, "Baseboard"); + LMI_Baseboard_Set_ElementName(&lmi_baseboard, "Baseboard"); LMI_Baseboard_Set_HostingBoard(&lmi_baseboard, 1); - LMI_Baseboard_Set_Caption(&lmi_baseboard, BASEBOARD_CLASS_NAME); + LMI_Baseboard_Set_Caption(&lmi_baseboard, "Baseboard"); LMI_Baseboard_Set_Description(&lmi_baseboard, "This object represents baseboard of the system."); if (strcmp(dmi_baseboard.serial_number, "Not Specified") == 0) { LMI_Baseboard_Set_Tag(&lmi_baseboard, "0"); LMI_Baseboard_Set_InstanceID(&lmi_baseboard, - LMI_ORGID ":" LMI_ORGID "_" BASEBOARD_CLASS_NAME ":0"); + LMI_ORGID ":" LMI_Baseboard_ClassName ":0"); } else { LMI_Baseboard_Set_Tag(&lmi_baseboard, dmi_baseboard.serial_number); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" BASEBOARD_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Baseboard_ClassName ":%s", dmi_baseboard.serial_number); LMI_Baseboard_Set_InstanceID(&lmi_baseboard, instance_id); } diff --git a/src/hardware/LMI_BatteryPhysicalPackageProvider.c b/src/hardware/LMI_BatteryPhysicalPackageProvider.c index 7ff67da..72336b0 100644 --- a/src/hardware/LMI_BatteryPhysicalPackageProvider.c +++ b/src/hardware/LMI_BatteryPhysicalPackageProvider.c @@ -21,7 +21,7 @@ #include #include #include "LMI_BatteryPhysicalPackage.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb = NULL; @@ -58,7 +58,7 @@ static CMPIStatus LMI_BatteryPhysicalPackageEnumInstances( { LMI_BatteryPhysicalPackage lmi_batt_phys; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; struct tm tm; unsigned i; DmiBattery *dmi_batt = NULL; @@ -72,7 +72,7 @@ static CMPIStatus LMI_BatteryPhysicalPackageEnumInstances( LMI_BatteryPhysicalPackage_Init(&lmi_batt_phys, _cb, ns); LMI_BatteryPhysicalPackage_Set_CreationClassName(&lmi_batt_phys, - LMI_ORGID "_" BATTERY_PHYS_PKG_CLASS_NAME); + LMI_BatteryPhysicalPackage_ClassName); LMI_BatteryPhysicalPackage_Set_PackageType(&lmi_batt_phys, LMI_BatteryPhysicalPackage_PackageType_Battery); LMI_BatteryPhysicalPackage_Set_Caption(&lmi_batt_phys, @@ -80,8 +80,8 @@ static CMPIStatus LMI_BatteryPhysicalPackageEnumInstances( LMI_BatteryPhysicalPackage_Set_Description(&lmi_batt_phys, "This object represents one physical battery package in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" BATTERY_PHYS_PKG_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_BatteryPhysicalPackage_ClassName ":%s", dmi_batt[i].name); LMI_BatteryPhysicalPackage_Set_Tag(&lmi_batt_phys, dmi_batt[i].name); diff --git a/src/hardware/LMI_BatteryProvider.c b/src/hardware/LMI_BatteryProvider.c index 0907bbc..2037e86 100644 --- a/src/hardware/LMI_BatteryProvider.c +++ b/src/hardware/LMI_BatteryProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_Battery.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" CMPIUint16 get_chemistry(const char *dmi_val); @@ -59,7 +59,7 @@ static CMPIStatus LMI_BatteryEnumInstances( { LMI_Battery lmi_batt; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiBattery *dmi_batt = NULL; unsigned dmi_batt_nb = 0; @@ -75,7 +75,7 @@ static CMPIStatus LMI_BatteryEnumInstances( lmi_get_system_creation_class_name()); LMI_Battery_Set_SystemName(&lmi_batt, lmi_get_system_name()); LMI_Battery_Set_CreationClassName(&lmi_batt, - LMI_ORGID "_" BATTERY_CLASS_NAME); + LMI_Battery_ClassName); LMI_Battery_Set_BatteryStatus(&lmi_batt, LMI_Battery_BatteryStatus_Unknown); LMI_Battery_Init_OperationalStatus(&lmi_batt, 1); @@ -85,12 +85,12 @@ static CMPIStatus LMI_BatteryEnumInstances( LMI_Battery_HealthState_Unknown); LMI_Battery_Set_EnabledState(&lmi_batt, LMI_Battery_EnabledState_Unknown); - LMI_Battery_Set_Caption(&lmi_batt, BATTERY_CLASS_NAME); + LMI_Battery_Set_Caption(&lmi_batt, "Battery"); LMI_Battery_Set_Description(&lmi_batt, "This object represents one battery in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" BATTERY_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Battery_ClassName ":%s", dmi_batt[i].name); LMI_Battery_Set_DeviceID(&lmi_batt, dmi_batt[i].name); diff --git a/src/hardware/LMI_BatterySystemDeviceProvider.c b/src/hardware/LMI_BatterySystemDeviceProvider.c index c3d465c..4c3b705 100644 --- a/src/hardware/LMI_BatterySystemDeviceProvider.c +++ b/src/hardware/LMI_BatterySystemDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_BatterySystemDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -74,7 +74,7 @@ static CMPIStatus LMI_BatterySystemDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_BatteryRef_Set_SystemName(&lmi_batt, lmi_get_system_name()); LMI_BatteryRef_Set_CreationClassName(&lmi_batt, - LMI_ORGID "_" BATTERY_CLASS_NAME); + LMI_Battery_ClassName); LMI_BatteryRef_Set_DeviceID(&lmi_batt, dmi_batt[i].name); LMI_BatterySystemDevice_SetObjectPath_GroupComponent( diff --git a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c index e95dc83..ca83c57 100644 --- a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c +++ b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ChassisComputerSystemPackage.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -68,7 +68,7 @@ static CMPIStatus LMI_ChassisComputerSystemPackageEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); LMI_ChassisComputerSystemPackage_SetObjectPath_Dependent( diff --git a/src/hardware/LMI_ChassisProvider.c b/src/hardware/LMI_ChassisProvider.c index d5ad789..66d793a 100644 --- a/src/hardware/LMI_ChassisProvider.c +++ b/src/hardware/LMI_ChassisProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_Chassis.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "virt_what.h" @@ -60,7 +60,7 @@ static CMPIStatus LMI_ChassisEnumInstances( { LMI_Chassis lmi_chassis; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN], *tag, *virt = NULL; + char instance_id[BUFLEN], *tag, *virt = NULL; DmiChassis dmi_chassis; if (dmi_get_chassis(&dmi_chassis) != 0) { @@ -70,7 +70,7 @@ static CMPIStatus LMI_ChassisEnumInstances( LMI_Chassis_Init(&lmi_chassis, _cb, ns); LMI_Chassis_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_Chassis_Set_PackageType(&lmi_chassis, LMI_Chassis_PackageType_Chassis_Frame); LMI_Chassis_Set_Caption(&lmi_chassis, "System Chassis"); @@ -78,8 +78,8 @@ static CMPIStatus LMI_ChassisEnumInstances( "This object represents physical chassis of the system."); tag = dmi_get_chassis_tag(&dmi_chassis); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CHASSIS_CLASS_NAME ":%s", tag); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Chassis_ClassName ":%s", tag); LMI_Chassis_Set_Tag(&lmi_chassis, tag); LMI_Chassis_Set_InstanceID(&lmi_chassis, instance_id); diff --git a/src/hardware/LMI_DiskDriveATAPortProvider.c b/src/hardware/LMI_DiskDriveATAPortProvider.c index 626d5f2..b4de4a0 100644 --- a/src/hardware/LMI_DiskDriveATAPortProvider.c +++ b/src/hardware/LMI_DiskDriveATAPortProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveATAPort.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "smartctl.h" #include "lsblk.h" @@ -61,7 +61,7 @@ static CMPIStatus LMI_DiskDriveATAPortEnumInstances( LMI_DiskDriveATAPort lmi_hdd_ata_port; const char *ns = KNameSpace(cop); unsigned i, j; - char instance_id[INSTANCE_ID_LEN], name[ELEMENT_NAME_LEN]; + char instance_id[BUFLEN], name[BUFLEN]; SmartctlHdd *smtcl_hdds = NULL; unsigned smtcl_hdds_nb = 0; LsblkHdd *lsblk_hdds = NULL; @@ -86,7 +86,7 @@ static CMPIStatus LMI_DiskDriveATAPortEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDriveATAPort_Set_SystemName(&lmi_hdd_ata_port, lmi_get_system_name()); LMI_DiskDriveATAPort_Set_CreationClassName(&lmi_hdd_ata_port, - LMI_ORGID "_" DISK_DRIVE_ATA_PORT_CLASS_NAME); + LMI_DiskDriveATAPort_ClassName); LMI_DiskDriveATAPort_Set_Caption(&lmi_hdd_ata_port, "Disk Drive ATA Port"); LMI_DiskDriveATAPort_Set_Description(&lmi_hdd_ata_port, @@ -94,11 +94,11 @@ static CMPIStatus LMI_DiskDriveATAPortEnumInstances( LMI_DiskDriveATAPort_Set_UsageRestriction(&lmi_hdd_ata_port, LMI_DiskDriveATAPort_UsageRestriction_Front_end_only); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PORT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAPort_ClassName, lsblk_hdds[i].name); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_ATA_PORT_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDriveATAPort_ClassName ":%s", name); LMI_DiskDriveATAPort_Set_DeviceID(&lmi_hdd_ata_port, name); diff --git a/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c b/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c index c7525d4..56d71e6 100644 --- a/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c +++ b/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveATAProtocolEndpoint.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb = NULL; @@ -58,7 +58,7 @@ static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances( LMI_DiskDriveATAProtocolEndpoint lmi_hdd_endpoint; const char *ns = KNameSpace(cop); unsigned i; - char instance_id[INSTANCE_ID_LEN], name[ELEMENT_NAME_LEN]; + char instance_id[BUFLEN], name[BUFLEN]; LsblkHdd *lsblk_hdds = NULL; unsigned lsblk_hdds_nb = 0; @@ -79,7 +79,7 @@ static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances( LMI_DiskDriveATAProtocolEndpoint_Set_SystemName(&lmi_hdd_endpoint, lmi_get_system_name()); LMI_DiskDriveATAProtocolEndpoint_Set_CreationClassName(&lmi_hdd_endpoint, - LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME); + LMI_DiskDriveATAProtocolEndpoint_ClassName); LMI_DiskDriveATAProtocolEndpoint_Set_Caption(&lmi_hdd_endpoint, "Disk Drive ATA Protocol Endpoint"); LMI_DiskDriveATAProtocolEndpoint_Set_Description(&lmi_hdd_endpoint, @@ -90,11 +90,11 @@ static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances( LMI_DiskDriveATAProtocolEndpoint_Set_ProtocolIFType(&lmi_hdd_endpoint, LMI_DiskDriveATAProtocolEndpoint_ProtocolIFType_Unknown); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAProtocolEndpoint_ClassName, lsblk_hdds[i].name); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDriveATAProtocolEndpoint_ClassName ":%s", name); LMI_DiskDriveATAProtocolEndpoint_Set_Name(&lmi_hdd_endpoint, name); diff --git a/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c b/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c index 5b2c186..1201321 100644 --- a/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c +++ b/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveDeviceSAPImplementation.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb; @@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveDeviceSAPImplementationEnumInstances( LMI_DiskDriveATAProtocolEndpointRef lmi_hdd_ata_endp; LMI_DiskDriveATAPortRef lmi_hdd_ata_port; const char *ns = KNameSpace(cop); - char name[ELEMENT_NAME_LEN]; + char name[BUFLEN]; unsigned i; LsblkHdd *lsblk_hdds = NULL; unsigned lsblk_hdds_nb = 0; @@ -76,8 +76,8 @@ static CMPIStatus LMI_DiskDriveDeviceSAPImplementationEnumInstances( LMI_DiskDriveDeviceSAPImplementation_Init(&lmi_hdd_sap_impl, _cb, ns); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PORT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAPort_ClassName, lsblk_hdds[i].name); LMI_DiskDriveATAPortRef_Init(&lmi_hdd_ata_port, _cb, ns); @@ -86,11 +86,11 @@ static CMPIStatus LMI_DiskDriveDeviceSAPImplementationEnumInstances( LMI_DiskDriveATAPortRef_Set_SystemName(&lmi_hdd_ata_port, lmi_get_system_name()); LMI_DiskDriveATAPortRef_Set_CreationClassName(&lmi_hdd_ata_port, - LMI_ORGID "_" DISK_DRIVE_ATA_PORT_CLASS_NAME); + LMI_DiskDriveATAPort_ClassName); LMI_DiskDriveATAPortRef_Set_DeviceID(&lmi_hdd_ata_port, name); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAProtocolEndpoint_ClassName, lsblk_hdds[i].name); LMI_DiskDriveATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns); @@ -99,7 +99,7 @@ static CMPIStatus LMI_DiskDriveDeviceSAPImplementationEnumInstances( LMI_DiskDriveATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp, lmi_get_system_name()); LMI_DiskDriveATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp, - LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME); + LMI_DiskDriveATAProtocolEndpoint_ClassName); LMI_DiskDriveATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name); LMI_DiskDriveDeviceSAPImplementation_Set_Antecedent(&lmi_hdd_sap_impl, diff --git a/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c b/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c index cf599be..aff9540 100644 --- a/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c +++ b/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveElementSoftwareIdentity.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb; @@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveElementSoftwareIdentityEnumInstances( LMI_DiskDriveSoftwareIdentityRef lmi_hdd_swi; LMI_DiskDriveRef lmi_hdd; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; LsblkHdd *lsblk_hdds = NULL; unsigned lsblk_hdds_nb = 0; @@ -81,11 +81,11 @@ static CMPIStatus LMI_DiskDriveElementSoftwareIdentityEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, lmi_get_system_name()); LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_DRIVE_CLASS_NAME); + LMI_DiskDrive_ClassName); LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_SW_IDENTITY_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDriveSoftwareIdentity_ClassName ":%s", lsblk_hdds[i].name); LMI_DiskDriveSoftwareIdentityRef_Init(&lmi_hdd_swi, _cb, ns); diff --git a/src/hardware/LMI_DiskDriveProvider.c b/src/hardware/LMI_DiskDriveProvider.c index 21e5b18..c71d075 100644 --- a/src/hardware/LMI_DiskDriveProvider.c +++ b/src/hardware/LMI_DiskDriveProvider.c @@ -22,7 +22,7 @@ #include #include #include "LMI_DiskDrive.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "smartctl.h" #include "lsblk.h" #include "sysfs.h" @@ -66,7 +66,7 @@ static CMPIStatus LMI_DiskDriveEnumInstances( const char *ns = KNameSpace(cop); unsigned i, j, rotational = 0, rpm; unsigned long capacity = 0; - char instance_id[INSTANCE_ID_LEN], path[PATH_MAX], *name; + char instance_id[BUFLEN], path[PATH_MAX], *name; CMPIUint16 operational_status; SmartctlHdd *smtcl_hdds = NULL; unsigned smtcl_hdds_nb = 0; @@ -98,13 +98,13 @@ static CMPIStatus LMI_DiskDriveEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDrive_Set_SystemName(&lmi_hdd, lmi_get_system_name()); LMI_DiskDrive_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_DRIVE_CLASS_NAME); + LMI_DiskDrive_ClassName); LMI_DiskDrive_Set_Caption(&lmi_hdd, "Disk Drive"); LMI_DiskDrive_Set_Description(&lmi_hdd, "This object represents one physical disk drive in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDrive_ClassName ":%s", lsblk_hdds[i].name); LMI_DiskDrive_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name); diff --git a/src/hardware/LMI_DiskDriveRealizesProvider.c b/src/hardware/LMI_DiskDriveRealizesProvider.c index 5d184e9..af15405 100644 --- a/src/hardware/LMI_DiskDriveRealizesProvider.c +++ b/src/hardware/LMI_DiskDriveRealizesProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveRealizes.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb; @@ -80,12 +80,12 @@ static CMPIStatus LMI_DiskDriveRealizesEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, lmi_get_system_name()); LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_DRIVE_CLASS_NAME); + LMI_DiskDrive_ClassName); LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name); LMI_DiskPhysicalPackageRef_Init(&lmi_hdd_phys, _cb, ns); LMI_DiskPhysicalPackageRef_Set_CreationClassName(&lmi_hdd_phys, - LMI_ORGID "_" DISK_PHYS_PKG_CLASS_NAME); + LMI_DiskPhysicalPackage_ClassName); LMI_DiskPhysicalPackageRef_Set_Tag(&lmi_hdd_phys, lsblk_hdds[i].name); LMI_DiskDriveRealizes_Set_Dependent(&lmi_hdd_realizes, &lmi_hdd); diff --git a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c index be68c87..c7b130b 100644 --- a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c +++ b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveSAPAvailableForElement.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb; @@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances( LMI_DiskDriveATAProtocolEndpointRef lmi_hdd_ata_endp; LMI_DiskDriveRef lmi_hdd; const char *ns = KNameSpace(cop); - char name[ELEMENT_NAME_LEN]; + char name[BUFLEN]; unsigned i; LsblkHdd *lsblk_hdds = NULL; unsigned lsblk_hdds_nb = 0; @@ -81,11 +81,11 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, lmi_get_system_name()); LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_DRIVE_CLASS_NAME); + LMI_DiskDrive_ClassName); LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAProtocolEndpoint_ClassName, lsblk_hdds[i].name); LMI_DiskDriveATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns); @@ -94,7 +94,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances( LMI_DiskDriveATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp, lmi_get_system_name()); LMI_DiskDriveATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp, - LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME); + LMI_DiskDriveATAProtocolEndpoint_ClassName); LMI_DiskDriveATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name); LMI_DiskDriveSAPAvailableForElement_Set_ManagedElement(&lmi_hdd_sap, diff --git a/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c b/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c index 34043fa..a3c139a 100644 --- a/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c +++ b/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveSoftwareIdentity.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "smartctl.h" #include "lsblk.h" @@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveSoftwareIdentityEnumInstances( LMI_DiskDriveSoftwareIdentity lmi_hdd_swi; const char *ns = KNameSpace(cop); unsigned i, j; - char instance_id[INSTANCE_ID_LEN], *fw_ver = NULL, name[ELEMENT_NAME_LEN]; + char instance_id[BUFLEN], *fw_ver = NULL, name[BUFLEN]; SmartctlHdd *smtcl_hdds = NULL; unsigned smtcl_hdds_nb = 0; LsblkHdd *lsblk_hdds = NULL; @@ -87,10 +87,10 @@ static CMPIStatus LMI_DiskDriveSoftwareIdentityEnumInstances( LMI_DiskDriveSoftwareIdentity_Set_Description(&lmi_hdd_swi, "This object represents firmware of disk drive in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_SW_IDENTITY_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDriveSoftwareIdentity_ClassName ":%s", lsblk_hdds[i].name); - snprintf(name, ELEMENT_NAME_LEN, "%s disk firmware", + snprintf(name, BUFLEN, "%s disk firmware", lsblk_hdds[i].name); LMI_DiskDriveSoftwareIdentity_Set_InstanceID(&lmi_hdd_swi, instance_id); diff --git a/src/hardware/LMI_DiskDriveSystemDeviceProvider.c b/src/hardware/LMI_DiskDriveSystemDeviceProvider.c index fd27b91..7f8f668 100644 --- a/src/hardware/LMI_DiskDriveSystemDeviceProvider.c +++ b/src/hardware/LMI_DiskDriveSystemDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskDriveSystemDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb; @@ -79,7 +79,7 @@ static CMPIStatus LMI_DiskDriveSystemDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, lmi_get_system_name()); LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_DRIVE_CLASS_NAME); + LMI_DiskDrive_ClassName); LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name); LMI_DiskDriveSystemDevice_SetObjectPath_GroupComponent( diff --git a/src/hardware/LMI_DiskPhysicalPackageContainerProvider.c b/src/hardware/LMI_DiskPhysicalPackageContainerProvider.c index 48e390a..7ac5ee9 100644 --- a/src/hardware/LMI_DiskPhysicalPackageContainerProvider.c +++ b/src/hardware/LMI_DiskPhysicalPackageContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskPhysicalPackageContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lsblk.h" @@ -74,7 +74,7 @@ static CMPIStatus LMI_DiskPhysicalPackageContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); for (i = 0; i < lsblk_hdds_nb; i++) { @@ -87,7 +87,7 @@ static CMPIStatus LMI_DiskPhysicalPackageContainerEnumInstances( LMI_DiskPhysicalPackageRef_Init(&lmi_hdd, _cb, ns); LMI_DiskPhysicalPackageRef_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_PHYS_PKG_CLASS_NAME); + LMI_DiskPhysicalPackage_ClassName); LMI_DiskPhysicalPackageRef_Set_Tag(&lmi_hdd, lsblk_hdds[i].name); LMI_DiskPhysicalPackageContainer_Set_GroupComponent(&lmi_hdd_container, diff --git a/src/hardware/LMI_DiskPhysicalPackageProvider.c b/src/hardware/LMI_DiskPhysicalPackageProvider.c index f619e0b..8d7d924 100644 --- a/src/hardware/LMI_DiskPhysicalPackageProvider.c +++ b/src/hardware/LMI_DiskPhysicalPackageProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_DiskPhysicalPackage.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "smartctl.h" #include "lsblk.h" @@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskPhysicalPackageEnumInstances( LMI_DiskPhysicalPackage lmi_hdd; const char *ns = KNameSpace(cop); unsigned i, j; - char instance_id[INSTANCE_ID_LEN], *serial_nb, *name, *model; + char instance_id[BUFLEN], *serial_nb, *name, *model; SmartctlHdd *smtcl_hdds = NULL; unsigned smtcl_hdds_nb = 0; LsblkHdd *lsblk_hdds = NULL; @@ -100,15 +100,15 @@ static CMPIStatus LMI_DiskPhysicalPackageEnumInstances( LMI_DiskPhysicalPackage_Init(&lmi_hdd, _cb, ns); LMI_DiskPhysicalPackage_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_PHYS_PKG_CLASS_NAME); + LMI_DiskPhysicalPackage_ClassName); LMI_DiskPhysicalPackage_Set_PackageType(&lmi_hdd, LMI_DiskPhysicalPackage_PackageType_Storage_Media_Package_e_g___Disk_or_Tape_Drive); LMI_DiskPhysicalPackage_Set_Caption(&lmi_hdd, "Physical Disk Package"); LMI_DiskPhysicalPackage_Set_Description(&lmi_hdd, "This object represents one physical disk package in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_PHYS_PKG_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskPhysicalPackage_ClassName ":%s", lsblk_hdds[i].name); LMI_DiskPhysicalPackage_Set_Tag(&lmi_hdd, lsblk_hdds[i].name); diff --git a/src/hardware/LMI_Hardware.h b/src/hardware/LMI_Hardware.h deleted file mode 100644 index db4d589..0000000 --- a/src/hardware/LMI_Hardware.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2013-2014 Red Hat, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Peter Schiffer - */ - -#ifndef LMI_HARDWARE_H_ -#define LMI_HARDWARE_H_ - -#include "openlmi.h" - -const ConfigEntry *provider_config_defaults; -const char *provider_name; - -#define INSTANCE_ID_LEN 128 -#define ELEMENT_NAME_LEN 128 - -#define CPU_CLASS_NAME "Processor" -#define CPU_CAP_CLASS_NAME "ProcessorCapabilities" -#define CPU_CACHE_CLASS_NAME "ProcessorCacheMemory" -#define CPU_CHIP_CLASS_NAME "ProcessorChip" -#define MEM_CLASS_NAME "Memory" -#define PHYS_MEM_CLASS_NAME "PhysicalMemory" -#define CHASSIS_CLASS_NAME "Chassis" -#define BASEBOARD_CLASS_NAME "Baseboard" -#define MEMORY_SLOT_CLASS_NAME "MemorySlot" -#define MEMORY_PHYS_PKG_CLASS_NAME "MemoryPhysicalPackage" -#define PORT_PHYS_CONN_CLASS_NAME "PortPhysicalConnector" -#define SYSTEM_SLOT_CLASS_NAME "SystemSlot" -#define POINTING_DEVICE_CLASS_NAME "PointingDevice" -#define BATTERY_CLASS_NAME "Battery" -#define BATTERY_PHYS_PKG_CLASS_NAME "BatteryPhysicalPackage" -#define PCI_DEVICE_CLASS_NAME "PCIDevice" -#define PCI_BRIDGE_CLASS_NAME "PCIBridge" -#define DISK_PHYS_PKG_CLASS_NAME "DiskPhysicalPackage" -#define DISK_DRIVE_CLASS_NAME "DiskDrive" -#define DISK_DRIVE_SW_IDENTITY_CLASS_NAME "DiskDriveSoftwareIdentity" -#define DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME "DiskDriveATAProtocolEndpoint" -#define DISK_DRIVE_ATA_PORT_CLASS_NAME "DiskDriveATAPort" - -#endif /* LMI_HARDWARE_H_ */ diff --git a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c index 04d4384..21614b8 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_MemoryPhysicalPackageInConnector.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -74,7 +74,7 @@ static CMPIStatus LMI_MemoryPhysicalPackageInConnectorEnumInstances( LMI_MemoryPhysicalPackageRef_Init(&lmi_phys_mem_pkg, _cb, ns); LMI_MemoryPhysicalPackageRef_Set_CreationClassName(&lmi_phys_mem_pkg, - LMI_ORGID "_" MEMORY_PHYS_PKG_CLASS_NAME); + LMI_MemoryPhysicalPackage_ClassName); LMI_MemoryPhysicalPackageRef_Set_Tag(&lmi_phys_mem_pkg, dmi_memory.modules[i].serial_number); @@ -84,7 +84,7 @@ static CMPIStatus LMI_MemoryPhysicalPackageInConnectorEnumInstances( dmi_memory.slots[j].slot_number); LMI_MemorySlotRef_Init(&lmi_mem_slot, _cb, ns); LMI_MemorySlotRef_Set_CreationClassName(&lmi_mem_slot, - LMI_ORGID "_" MEMORY_SLOT_CLASS_NAME); + LMI_MemorySlot_ClassName); LMI_MemorySlotRef_Set_Tag(&lmi_mem_slot, tag); LMI_MemoryPhysicalPackageInConnector_Set_Antecedent( diff --git a/src/hardware/LMI_MemoryPhysicalPackageProvider.c b/src/hardware/LMI_MemoryPhysicalPackageProvider.c index e277fc1..a694ebd 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_MemoryPhysicalPackage.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb = NULL; @@ -57,7 +57,7 @@ static CMPIStatus LMI_MemoryPhysicalPackageEnumInstances( { LMI_MemoryPhysicalPackage lmi_phys_mem_pkg; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiMemory dmi_memory; @@ -69,7 +69,7 @@ static CMPIStatus LMI_MemoryPhysicalPackageEnumInstances( LMI_MemoryPhysicalPackage_Init(&lmi_phys_mem_pkg, _cb, ns); LMI_MemoryPhysicalPackage_Set_CreationClassName(&lmi_phys_mem_pkg, - LMI_ORGID "_" MEMORY_PHYS_PKG_CLASS_NAME); + LMI_MemoryPhysicalPackage_ClassName); LMI_MemoryPhysicalPackage_Set_PackageType(&lmi_phys_mem_pkg, LMI_MemoryPhysicalPackage_PackageType_Memory); LMI_MemoryPhysicalPackage_Set_Caption(&lmi_phys_mem_pkg, @@ -77,8 +77,8 @@ static CMPIStatus LMI_MemoryPhysicalPackageEnumInstances( LMI_MemoryPhysicalPackage_Set_Description(&lmi_phys_mem_pkg, "This object represents one physical memory package in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" MEMORY_PHYS_PKG_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_MemoryPhysicalPackage_ClassName ":%s", dmi_memory.modules[i].serial_number); LMI_MemoryPhysicalPackage_Set_Tag(&lmi_phys_mem_pkg, diff --git a/src/hardware/LMI_MemoryProvider.c b/src/hardware/LMI_MemoryProvider.c index bea9bf2..9ec9667 100644 --- a/src/hardware/LMI_MemoryProvider.c +++ b/src/hardware/LMI_MemoryProvider.c @@ -23,7 +23,7 @@ #include #include #include "LMI_Memory.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "procfs.h" #include "sysfs.h" @@ -84,7 +84,7 @@ static CMPIStatus LMI_MemoryEnumInstances( LMI_Memory_Set_SystemCreationClassName(&lmi_mem, lmi_get_system_creation_class_name()); LMI_Memory_Set_SystemName(&lmi_mem, lmi_get_system_name()); - LMI_Memory_Set_CreationClassName(&lmi_mem, LMI_ORGID "_" MEM_CLASS_NAME); + LMI_Memory_Set_CreationClassName(&lmi_mem, LMI_Memory_ClassName); LMI_Memory_Set_DeviceID(&lmi_mem, "0"); LMI_Memory_Set_Volatile(&lmi_mem, 1); @@ -101,7 +101,7 @@ static CMPIStatus LMI_MemoryEnumInstances( LMI_Memory_Set_Description(&lmi_mem, "This object represents all memory available in system."); LMI_Memory_Set_InstanceID(&lmi_mem, - LMI_ORGID ":" LMI_ORGID "_" MEM_CLASS_NAME ":0"); + LMI_ORGID ":" LMI_Memory_ClassName ":0"); LMI_Memory_Set_IsCompressed(&lmi_mem, 0); LMI_Memory_Set_Purpose(&lmi_mem, "The system memory is temporary storage " "area storing instructions and data required by processor " diff --git a/src/hardware/LMI_MemorySlotContainerProvider.c b/src/hardware/LMI_MemorySlotContainerProvider.c index 8852954..e23982a 100644 --- a/src/hardware/LMI_MemorySlotContainerProvider.c +++ b/src/hardware/LMI_MemorySlotContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_MemorySlotContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -73,7 +73,7 @@ static CMPIStatus LMI_MemorySlotContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); if (strcmp(dmi_chassis.serial_number, "Not Specified") == 0) { LMI_ChassisRef_Set_Tag(&lmi_chassis, "0"); } else { @@ -87,7 +87,7 @@ static CMPIStatus LMI_MemorySlotContainerEnumInstances( LMI_MemorySlotRef_Init(&lmi_mem_slot, _cb, ns); LMI_MemorySlotRef_Set_CreationClassName(&lmi_mem_slot, - LMI_ORGID "_" MEMORY_SLOT_CLASS_NAME); + LMI_MemorySlot_ClassName); LMI_MemorySlotRef_Set_Tag(&lmi_mem_slot, tag); LMI_MemorySlotContainer_Set_GroupComponent(&lmi_mem_slot_container, diff --git a/src/hardware/LMI_MemorySlotProvider.c b/src/hardware/LMI_MemorySlotProvider.c index 2c8116f..f299e4c 100644 --- a/src/hardware/LMI_MemorySlotProvider.c +++ b/src/hardware/LMI_MemorySlotProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_MemorySlot.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb = NULL; @@ -57,7 +57,7 @@ static CMPIStatus LMI_MemorySlotEnumInstances( { LMI_MemorySlot lmi_mem_slot; const char *ns = KNameSpace(cop); - char tag[LONG_INT_LEN], instance_id[INSTANCE_ID_LEN]; + char tag[LONG_INT_LEN], instance_id[BUFLEN]; unsigned i; DmiMemory dmi_memory; @@ -69,8 +69,8 @@ static CMPIStatus LMI_MemorySlotEnumInstances( LMI_MemorySlot_Init(&lmi_mem_slot, _cb, ns); snprintf(tag, LONG_INT_LEN, "%d", dmi_memory.slots[i].slot_number); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" MEMORY_SLOT_CLASS_NAME ":%d", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_MemorySlot_ClassName ":%d", dmi_memory.slots[i].slot_number); LMI_MemorySlot_Set_ConnectorLayout(&lmi_mem_slot, @@ -82,7 +82,7 @@ static CMPIStatus LMI_MemorySlotEnumInstances( LMI_MemorySlot_ConnectorGender_Female); LMI_MemorySlot_Set_CreationClassName(&lmi_mem_slot, - LMI_ORGID "_" MEMORY_SLOT_CLASS_NAME); + LMI_MemorySlot_ClassName); LMI_MemorySlot_Set_Tag(&lmi_mem_slot, tag); LMI_MemorySlot_Set_Number(&lmi_mem_slot, dmi_memory.slots[i].slot_number); diff --git a/src/hardware/LMI_MemorySystemDeviceProvider.c b/src/hardware/LMI_MemorySystemDeviceProvider.c index 0f79ab7..b91432b 100644 --- a/src/hardware/LMI_MemorySystemDeviceProvider.c +++ b/src/hardware/LMI_MemorySystemDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_MemorySystemDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" static const CMPIBroker* _cb; @@ -64,7 +64,7 @@ static CMPIStatus LMI_MemorySystemDeviceEnumInstances( LMI_MemoryRef_Set_SystemCreationClassName(&lmi_mem, lmi_get_system_creation_class_name()); LMI_MemoryRef_Set_SystemName(&lmi_mem, lmi_get_system_name()); - LMI_MemoryRef_Set_CreationClassName(&lmi_mem, LMI_ORGID "_" MEM_CLASS_NAME); + LMI_MemoryRef_Set_CreationClassName(&lmi_mem, LMI_Memory_ClassName); LMI_MemoryRef_Set_DeviceID(&lmi_mem, "0"); LMI_MemorySystemDevice_SetObjectPath_GroupComponent( diff --git a/src/hardware/LMI_PCIBridgeProvider.c b/src/hardware/LMI_PCIBridgeProvider.c index 9863186..d976f8f 100644 --- a/src/hardware/LMI_PCIBridgeProvider.c +++ b/src/hardware/LMI_PCIBridgeProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PCIBridge.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "PCIDev.h" CMPIUint16 get_bridge_type(const char *bridge_type); @@ -82,13 +82,13 @@ static CMPIStatus LMI_PCIBridgeEnumInstances( pref_limit, pref_type, pref_base_upper = 0, pref_limit_upper = 0; struct pci_dev *dev; struct pci_cap *cap; - char vendor_buf[NAME_BUF_SIZE], *vendor_name; - char device_buf[NAME_BUF_SIZE], *device_name; - char subsys_buf[NAME_BUF_SIZE], *subsys_name; - char svendor_buf[NAME_BUF_SIZE], *svendor_name; - char class_buf[NAME_BUF_SIZE], *class; - char device_id_str[PCI_DEVID_STR_SIZE]; - char instance_id[INSTANCE_ID_LEN]; + char vendor_buf[BUFLEN], *vendor_name; + char device_buf[BUFLEN], *device_name; + char subsys_buf[BUFLEN], *subsys_name; + char svendor_buf[BUFLEN], *svendor_name; + char class_buf[BUFLEN], *class; + char device_id_str[BUFLEN]; + char instance_id[BUFLEN]; for (dev = acc_bridge->devices; dev; dev = dev->next) { /* Use only PCI Bridges */ @@ -97,17 +97,17 @@ static CMPIStatus LMI_PCIBridgeEnumInstances( continue; } - vendor_name = pci_lookup_name(acc_bridge, vendor_buf, NAME_BUF_SIZE, + vendor_name = pci_lookup_name(acc_bridge, vendor_buf, BUFLEN, PCI_LOOKUP_VENDOR, dev->vendor_id); - device_name = pci_lookup_name(acc_bridge, device_buf, NAME_BUF_SIZE, + device_name = pci_lookup_name(acc_bridge, device_buf, BUFLEN, PCI_LOOKUP_DEVICE, dev->vendor_id, dev->device_id); get_subid(dev, &svid, &subid); - subsys_name = pci_lookup_name(acc_bridge, subsys_buf, NAME_BUF_SIZE, + subsys_name = pci_lookup_name(acc_bridge, subsys_buf, BUFLEN, PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM, dev->vendor_id, dev->device_id, svid, subid); - svendor_name = pci_lookup_name(acc_bridge, svendor_buf, NAME_BUF_SIZE, + svendor_name = pci_lookup_name(acc_bridge, svendor_buf, BUFLEN, PCI_LOOKUP_VENDOR | PCI_LOOKUP_SUBSYSTEM, svid); - class = pci_lookup_name(acc_bridge, class_buf, NAME_BUF_SIZE, + class = pci_lookup_name(acc_bridge, class_buf, BUFLEN, PCI_LOOKUP_CLASS, dev->device_class); status = pci_read_word(dev, PCI_STATUS); rev = pci_read_byte(dev, PCI_REVISION_ID); @@ -127,10 +127,10 @@ static CMPIStatus LMI_PCIBridgeEnumInstances( pref_type = pref_base & PCI_PREF_RANGE_TYPE_MASK; sec_status = pci_read_word(dev, PCI_SEC_STATUS); - snprintf(device_id_str, PCI_DEVID_STR_SIZE, "%02x:%02x.%u", + snprintf(device_id_str, BUFLEN, "%02x:%02x.%u", dev->bus, dev->dev, dev->func); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" PCI_BRIDGE_CLASS_NAME ":%s", device_id_str); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_PCIBridge_ClassName ":%s", device_id_str); LMI_PCIBridge_Init(&lmi_dev, _cb, ns); @@ -138,7 +138,7 @@ static CMPIStatus LMI_PCIBridgeEnumInstances( lmi_get_system_creation_class_name()); LMI_PCIBridge_Set_SystemName(&lmi_dev, lmi_get_system_name()); LMI_PCIBridge_Set_CreationClassName(&lmi_dev, - LMI_ORGID "_" PCI_BRIDGE_CLASS_NAME); + LMI_PCIBridge_ClassName); LMI_PCIBridge_Set_Caption(&lmi_dev, "This object represents one PCI bridge contained in system."); diff --git a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c index 6618d08..8beb9ff 100644 --- a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PCIBridgeSystemDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "PCIDev.h" static const CMPIBroker* _cb; @@ -68,7 +68,7 @@ static CMPIStatus LMI_PCIBridgeSystemDeviceEnumInstances( LMI_PCIBridgeRef lmi_dev; const char *ns = KNameSpace(cop); struct pci_dev *dev; - char device_id_str[PCI_DEVID_STR_SIZE]; + char device_id_str[BUFLEN]; for (dev = acc_system_bridge->devices; dev; dev = dev->next) { /* Use only PCI Bridges */ @@ -79,7 +79,7 @@ static CMPIStatus LMI_PCIBridgeSystemDeviceEnumInstances( LMI_PCIBridgeSystemDevice_Init(&lmi_pci_sys_device, _cb, ns); - snprintf(device_id_str, PCI_DEVID_STR_SIZE, "%02x:%02x.%u", + snprintf(device_id_str, BUFLEN, "%02x:%02x.%u", dev->bus, dev->dev, dev->func); LMI_PCIBridgeRef_Init(&lmi_dev, _cb, ns); @@ -87,7 +87,7 @@ static CMPIStatus LMI_PCIBridgeSystemDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_PCIBridgeRef_Set_SystemName(&lmi_dev, lmi_get_system_name()); LMI_PCIBridgeRef_Set_CreationClassName(&lmi_dev, - LMI_ORGID "_" PCI_BRIDGE_CLASS_NAME); + LMI_PCIBridge_ClassName); LMI_PCIBridgeRef_Set_DeviceID(&lmi_dev, device_id_str); LMI_PCIBridgeSystemDevice_SetObjectPath_GroupComponent( diff --git a/src/hardware/LMI_PCIDeviceProvider.c b/src/hardware/LMI_PCIDeviceProvider.c index edb1528..d105628 100644 --- a/src/hardware/LMI_PCIDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceProvider.c @@ -21,7 +21,7 @@ #include #include "LMI_PCIDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "PCIDev.h" static const CMPIBroker* _cb = NULL; @@ -78,12 +78,12 @@ static CMPIStatus LMI_PCIDeviceEnumInstances( u16 svid, subid, status, command_reg; struct pci_dev *dev; struct pci_cap *cap; - char vendor_buf[NAME_BUF_SIZE], *vendor_name; - char device_buf[NAME_BUF_SIZE], *device_name; - char subsys_buf[NAME_BUF_SIZE], *subsys_name; - char svendor_buf[NAME_BUF_SIZE], *svendor_name; - char device_id_str[PCI_DEVID_STR_SIZE]; - char instance_id[INSTANCE_ID_LEN]; + char vendor_buf[BUFLEN], *vendor_name; + char device_buf[BUFLEN], *device_name; + char subsys_buf[BUFLEN], *subsys_name; + char svendor_buf[BUFLEN], *svendor_name; + char device_id_str[BUFLEN]; + char instance_id[BUFLEN]; for (dev = acc_dev->devices; dev; dev = dev->next) { /* Ignore PCI Bridges */ @@ -92,25 +92,25 @@ static CMPIStatus LMI_PCIDeviceEnumInstances( continue; } - vendor_name = pci_lookup_name(acc_dev, vendor_buf, NAME_BUF_SIZE, + vendor_name = pci_lookup_name(acc_dev, vendor_buf, BUFLEN, PCI_LOOKUP_VENDOR, dev->vendor_id); - device_name = pci_lookup_name(acc_dev, device_buf, NAME_BUF_SIZE, + device_name = pci_lookup_name(acc_dev, device_buf, BUFLEN, PCI_LOOKUP_DEVICE, dev->vendor_id, dev->device_id); get_subid(dev, &svid, &subid); - subsys_name = pci_lookup_name(acc_dev, subsys_buf, NAME_BUF_SIZE, + subsys_name = pci_lookup_name(acc_dev, subsys_buf, BUFLEN, PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM, dev->vendor_id, dev->device_id, svid, subid); - svendor_name = pci_lookup_name(acc_dev, svendor_buf, NAME_BUF_SIZE, + svendor_name = pci_lookup_name(acc_dev, svendor_buf, BUFLEN, PCI_LOOKUP_VENDOR | PCI_LOOKUP_SUBSYSTEM, svid); status = pci_read_word(dev, PCI_STATUS); rev = pci_read_byte(dev, PCI_REVISION_ID); cache_line = pci_read_byte(dev, PCI_CACHE_LINE_SIZE); command_reg = pci_read_word(dev, PCI_COMMAND); - snprintf(device_id_str, PCI_DEVID_STR_SIZE, "%02x:%02x.%u", + snprintf(device_id_str, BUFLEN, "%02x:%02x.%u", dev->bus, dev->dev, dev->func); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" PCI_DEVICE_CLASS_NAME ":%s", device_id_str); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_PCIDevice_ClassName ":%s", device_id_str); LMI_PCIDevice_Init(&lmi_dev, _cb, ns); @@ -118,7 +118,7 @@ static CMPIStatus LMI_PCIDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_PCIDevice_Set_SystemName(&lmi_dev, lmi_get_system_name()); LMI_PCIDevice_Set_CreationClassName(&lmi_dev, - LMI_ORGID "_" PCI_DEVICE_CLASS_NAME); + LMI_PCIDevice_ClassName); LMI_PCIDevice_Set_Caption(&lmi_dev, "This object represents one logical PCI device contained in system."); diff --git a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c index 84279c8..99a8ca2 100644 --- a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PCIDeviceSystemDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "PCIDev.h" static const CMPIBroker* _cb; @@ -68,7 +68,7 @@ static CMPIStatus LMI_PCIDeviceSystemDeviceEnumInstances( LMI_PCIDeviceRef lmi_dev; const char *ns = KNameSpace(cop); struct pci_dev *dev; - char device_id_str[PCI_DEVID_STR_SIZE]; + char device_id_str[BUFLEN]; for (dev = acc_system_dev->devices; dev; dev = dev->next) { /* Ignore PCI Bridges */ @@ -79,7 +79,7 @@ static CMPIStatus LMI_PCIDeviceSystemDeviceEnumInstances( LMI_PCIDeviceSystemDevice_Init(&lmi_pci_sys_device, _cb, ns); - snprintf(device_id_str, PCI_DEVID_STR_SIZE, "%02x:%02x.%u", + snprintf(device_id_str, BUFLEN, "%02x:%02x.%u", dev->bus, dev->dev, dev->func); LMI_PCIDeviceRef_Init(&lmi_dev, _cb, ns); @@ -87,7 +87,7 @@ static CMPIStatus LMI_PCIDeviceSystemDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_PCIDeviceRef_Set_SystemName(&lmi_dev, lmi_get_system_name()); LMI_PCIDeviceRef_Set_CreationClassName(&lmi_dev, - LMI_ORGID "_" PCI_DEVICE_CLASS_NAME); + LMI_PCIDevice_ClassName); LMI_PCIDeviceRef_Set_DeviceID(&lmi_dev, device_id_str); LMI_PCIDeviceSystemDevice_SetObjectPath_GroupComponent( diff --git a/src/hardware/LMI_PhysicalBatteryContainerProvider.c b/src/hardware/LMI_PhysicalBatteryContainerProvider.c index 57985e9..f143e2b 100644 --- a/src/hardware/LMI_PhysicalBatteryContainerProvider.c +++ b/src/hardware/LMI_PhysicalBatteryContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PhysicalBatteryContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -73,7 +73,7 @@ static CMPIStatus LMI_PhysicalBatteryContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); for (i = 0; i < dmi_batt_nb; i++) { @@ -81,7 +81,7 @@ static CMPIStatus LMI_PhysicalBatteryContainerEnumInstances( LMI_BatteryPhysicalPackageRef_Init(&lmi_batt_phys, _cb, ns); LMI_BatteryPhysicalPackageRef_Set_CreationClassName(&lmi_batt_phys, - LMI_ORGID "_" BATTERY_PHYS_PKG_CLASS_NAME); + LMI_BatteryPhysicalPackage_ClassName); LMI_BatteryPhysicalPackageRef_Set_Tag(&lmi_batt_phys, dmi_batt[i].name); LMI_PhysicalBatteryContainer_Set_GroupComponent( diff --git a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c index a9d1f16..114e613 100644 --- a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PhysicalBatteryRealizes.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -75,12 +75,12 @@ static CMPIStatus LMI_PhysicalBatteryRealizesEnumInstances( lmi_get_system_creation_class_name()); LMI_BatteryRef_Set_SystemName(&lmi_batt, lmi_get_system_name()); LMI_BatteryRef_Set_CreationClassName(&lmi_batt, - LMI_ORGID "_" BATTERY_CLASS_NAME); + LMI_Battery_ClassName); LMI_BatteryRef_Set_DeviceID(&lmi_batt, dmi_batt[i].name); LMI_BatteryPhysicalPackageRef_Init(&lmi_batt_phys, _cb, ns); LMI_BatteryPhysicalPackageRef_Set_CreationClassName(&lmi_batt_phys, - LMI_ORGID "_" BATTERY_PHYS_PKG_CLASS_NAME); + LMI_BatteryPhysicalPackage_ClassName); LMI_BatteryPhysicalPackageRef_Set_Tag(&lmi_batt_phys, dmi_batt[i].name); LMI_PhysicalBatteryRealizes_Set_Antecedent(&lmi_phys_batt_realizes, diff --git a/src/hardware/LMI_PhysicalMemoryContainerProvider.c b/src/hardware/LMI_PhysicalMemoryContainerProvider.c index bff9955..bc0f3ff 100644 --- a/src/hardware/LMI_PhysicalMemoryContainerProvider.c +++ b/src/hardware/LMI_PhysicalMemoryContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PhysicalMemoryContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -71,13 +71,13 @@ static CMPIStatus LMI_PhysicalMemoryContainerEnumInstances( LMI_PhysicalMemoryRef_Init(&lmi_phys_mem, _cb, ns); LMI_PhysicalMemoryRef_Set_CreationClassName(&lmi_phys_mem, - LMI_ORGID "_" PHYS_MEM_CLASS_NAME); + LMI_PhysicalMemory_ClassName); LMI_PhysicalMemoryRef_Set_Tag(&lmi_phys_mem, dmi_memory.modules[i].serial_number); LMI_MemoryPhysicalPackageRef_Init(&lmi_phys_mem_pkg, _cb, ns); LMI_MemoryPhysicalPackageRef_Set_CreationClassName(&lmi_phys_mem_pkg, - LMI_ORGID "_" MEMORY_PHYS_PKG_CLASS_NAME); + LMI_MemoryPhysicalPackage_ClassName); LMI_MemoryPhysicalPackageRef_Set_Tag(&lmi_phys_mem_pkg, dmi_memory.modules[i].serial_number); diff --git a/src/hardware/LMI_PhysicalMemoryProvider.c b/src/hardware/LMI_PhysicalMemoryProvider.c index b7dc9a7..55d77f2 100644 --- a/src/hardware/LMI_PhysicalMemoryProvider.c +++ b/src/hardware/LMI_PhysicalMemoryProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PhysicalMemory.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" @@ -61,7 +61,7 @@ static CMPIStatus LMI_PhysicalMemoryEnumInstances( { LMI_PhysicalMemory lmi_phys_mem; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiMemory dmi_memory; @@ -73,10 +73,10 @@ static CMPIStatus LMI_PhysicalMemoryEnumInstances( LMI_PhysicalMemory_Init(&lmi_phys_mem, _cb, ns); LMI_PhysicalMemory_Set_CreationClassName(&lmi_phys_mem, - LMI_ORGID "_" PHYS_MEM_CLASS_NAME); + LMI_PhysicalMemory_ClassName); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" PHYS_MEM_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_PhysicalMemory_ClassName ":%s", dmi_memory.modules[i].serial_number); LMI_PhysicalMemory_Set_Tag(&lmi_phys_mem, diff --git a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c index 4f44db7..77f4d85 100644 --- a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PhysicalMemoryRealizes.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -70,7 +70,7 @@ static CMPIStatus LMI_PhysicalMemoryRealizesEnumInstances( LMI_MemoryRef_Set_SystemCreationClassName(&lmi_mem, lmi_get_system_creation_class_name()); LMI_MemoryRef_Set_SystemName(&lmi_mem, lmi_get_system_name()); - LMI_MemoryRef_Set_CreationClassName(&lmi_mem, LMI_ORGID "_" MEM_CLASS_NAME); + LMI_MemoryRef_Set_CreationClassName(&lmi_mem, LMI_Memory_ClassName); LMI_MemoryRef_Set_DeviceID(&lmi_mem, "0"); for (i = 0; i < dmi_memory.modules_nb; i++) { @@ -78,7 +78,7 @@ static CMPIStatus LMI_PhysicalMemoryRealizesEnumInstances( LMI_PhysicalMemoryRef_Init(&lmi_phys_mem, _cb, ns); LMI_PhysicalMemoryRef_Set_CreationClassName(&lmi_phys_mem, - LMI_ORGID "_" PHYS_MEM_CLASS_NAME); + LMI_PhysicalMemory_ClassName); LMI_PhysicalMemoryRef_Set_Tag(&lmi_phys_mem, dmi_memory.modules[i].serial_number); diff --git a/src/hardware/LMI_PointingDeviceProvider.c b/src/hardware/LMI_PointingDeviceProvider.c index 1999a00..e7edec3 100644 --- a/src/hardware/LMI_PointingDeviceProvider.c +++ b/src/hardware/LMI_PointingDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PointingDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" CMPIUint16 get_pointingtype(const char *dmi_val); @@ -59,7 +59,7 @@ static CMPIStatus LMI_PointingDeviceEnumInstances( { LMI_PointingDevice lmi_dev; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiPointingDevice *dmi_dev = NULL; unsigned dmi_dev_nb = 0; @@ -75,13 +75,13 @@ static CMPIStatus LMI_PointingDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_PointingDevice_Set_SystemName(&lmi_dev, lmi_get_system_name()); LMI_PointingDevice_Set_CreationClassName(&lmi_dev, - LMI_ORGID "_" POINTING_DEVICE_CLASS_NAME); + LMI_PointingDevice_ClassName); LMI_PointingDevice_Set_Caption(&lmi_dev, "Pointing Device"); LMI_PointingDevice_Set_Description(&lmi_dev, "This object represents one pointing device."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" POINTING_DEVICE_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_PointingDevice_ClassName ":%s", dmi_dev[i].type); LMI_PointingDevice_Set_DeviceID(&lmi_dev, dmi_dev[i].type); diff --git a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c index 591fdcc..2f5b510 100644 --- a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PortPhysicalConnectorContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -73,7 +73,7 @@ static CMPIStatus LMI_PortPhysicalConnectorContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); for (i = 0; i < dmi_ports_nb; i++) { @@ -81,7 +81,7 @@ static CMPIStatus LMI_PortPhysicalConnectorContainerEnumInstances( LMI_PortPhysicalConnectorRef_Init(&lmi_port, _cb, ns); LMI_PortPhysicalConnectorRef_Set_CreationClassName(&lmi_port, - LMI_ORGID "_" PORT_PHYS_CONN_CLASS_NAME); + LMI_PortPhysicalConnector_ClassName); LMI_PortPhysicalConnectorRef_Set_Tag(&lmi_port, dmi_ports[i].name); LMI_PortPhysicalConnectorContainer_Set_GroupComponent( diff --git a/src/hardware/LMI_PortPhysicalConnectorProvider.c b/src/hardware/LMI_PortPhysicalConnectorProvider.c index 9f2cac2..b2bf58d 100644 --- a/src/hardware/LMI_PortPhysicalConnectorProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_PortPhysicalConnector.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" CMPIUint16 get_connectorlayout(const char *dmi_val); @@ -60,7 +60,7 @@ static CMPIStatus LMI_PortPhysicalConnectorEnumInstances( LMI_PortPhysicalConnector lmi_port; const char *ns = KNameSpace(cop); CMPIUint16 conn_layout; - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiPort *dmi_ports = NULL; unsigned dmi_ports_nb = 0; @@ -73,13 +73,13 @@ static CMPIStatus LMI_PortPhysicalConnectorEnumInstances( LMI_PortPhysicalConnector_Init(&lmi_port, _cb, ns); LMI_PortPhysicalConnector_Set_CreationClassName(&lmi_port, - LMI_ORGID "_" PORT_PHYS_CONN_CLASS_NAME); + LMI_PortPhysicalConnector_ClassName); LMI_PortPhysicalConnector_Set_Caption(&lmi_port, "Physical Port"); LMI_PortPhysicalConnector_Set_Description(&lmi_port, "This object represents one physical port on the chassis."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" PORT_PHYS_CONN_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_PortPhysicalConnector_ClassName ":%s", dmi_ports[i].name); conn_layout = get_connectorlayout(dmi_ports[i].type); diff --git a/src/hardware/LMI_ProcessorCacheMemoryProvider.c b/src/hardware/LMI_ProcessorCacheMemoryProvider.c index 92c3a91..bbb8989 100644 --- a/src/hardware/LMI_ProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_ProcessorCacheMemoryProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ProcessorCacheMemory.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "sysfs.h" @@ -60,7 +60,7 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( { LMI_ProcessorCacheMemory lmi_cpu_cache; const char *ns = KNameSpace(cop); - char *error_msg = NULL, instance_id[INSTANCE_ID_LEN]; + char *error_msg = NULL, instance_id[BUFLEN]; unsigned i, caches = 0; DmiCpuCache *dmi_cpu_caches = NULL; unsigned dmi_cpu_caches_nb = 0; @@ -92,7 +92,7 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( LMI_ProcessorCacheMemory_Set_SystemName(&lmi_cpu_cache, lmi_get_system_name()); LMI_ProcessorCacheMemory_Set_CreationClassName(&lmi_cpu_cache, - LMI_ORGID "_" CPU_CACHE_CLASS_NAME); + LMI_ProcessorCacheMemory_ClassName); LMI_ProcessorCacheMemory_Set_BlockSize(&lmi_cpu_cache, 1); LMI_ProcessorCacheMemory_Set_Volatile(&lmi_cpu_cache, 1); @@ -116,8 +116,8 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( /* do we have dmidecode output? */ if (dmi_cpu_caches_nb > 0) { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CACHE_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCacheMemory_ClassName ":%s", dmi_cpu_caches[i].id); LMI_ProcessorCacheMemory_Set_DeviceID(&lmi_cpu_cache, @@ -132,8 +132,8 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( LMI_ProcessorCacheMemory_Set_EnabledState(&lmi_cpu_cache, get_cachestatus(dmi_cpu_caches[i].status)); } else { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CACHE_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCacheMemory_ClassName ":%s", sysfs_cpu_caches[i].id); LMI_ProcessorCacheMemory_Set_DeviceID(&lmi_cpu_cache, diff --git a/src/hardware/LMI_ProcessorCapabilitiesProvider.c b/src/hardware/LMI_ProcessorCapabilitiesProvider.c index c125541..6287422 100644 --- a/src/hardware/LMI_ProcessorCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorCapabilitiesProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ProcessorCapabilities.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lscpu.h" @@ -60,8 +60,8 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances( CMPIUint16 cores = 1, threads = 1; const char *ns = KNameSpace(cop), *element_name_string = "Capabilities of processor "; - char *error_msg = NULL, instance_id[INSTANCE_ID_LEN], - element_name[ELEMENT_NAME_LEN]; + char *error_msg = NULL, instance_id[BUFLEN], + element_name[BUFLEN]; unsigned i, cpus_nb = 0; DmiProcessor *dmi_cpus = NULL; unsigned dmi_cpus_nb = 0; @@ -89,17 +89,17 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances( /* do we have output from dmidecode program? */ if (dmi_cpus_nb > 0) { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%s", dmi_cpus[i].id); - snprintf(element_name, ELEMENT_NAME_LEN, "%s%s", + snprintf(element_name, BUFLEN, "%s%s", element_name_string, dmi_cpus[i].id); cores = dmi_cpus[i].cores; threads = dmi_cpus[i].threads; } else { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%u", i); - snprintf(element_name, ELEMENT_NAME_LEN, "%s%u", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%u", i); + snprintf(element_name, BUFLEN, "%s%u", element_name_string, i); } if (cores < lscpu.cores) { diff --git a/src/hardware/LMI_ProcessorChipContainerProvider.c b/src/hardware/LMI_ProcessorChipContainerProvider.c index 0c2f646..7e92336 100644 --- a/src/hardware/LMI_ProcessorChipContainerProvider.c +++ b/src/hardware/LMI_ProcessorChipContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ProcessorChipContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -73,7 +73,7 @@ static CMPIStatus LMI_ProcessorChipContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); for (i = 0; i < dmi_cpus_nb; i++) { @@ -81,7 +81,7 @@ static CMPIStatus LMI_ProcessorChipContainerEnumInstances( LMI_ProcessorChipRef_Init(&lmi_cpu_chip, _cb, ns); LMI_ProcessorChipRef_Set_CreationClassName(&lmi_cpu_chip, - LMI_ORGID "_" CPU_CHIP_CLASS_NAME); + LMI_ProcessorChip_ClassName); LMI_ProcessorChipRef_Set_Tag(&lmi_cpu_chip, dmi_cpus[i].id); LMI_ProcessorChipContainer_Set_GroupComponent(&lmi_cpu_chip_container, diff --git a/src/hardware/LMI_ProcessorChipProvider.c b/src/hardware/LMI_ProcessorChipProvider.c index d3a2d14..50e2ecf 100644 --- a/src/hardware/LMI_ProcessorChipProvider.c +++ b/src/hardware/LMI_ProcessorChipProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ProcessorChip.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "procfs.h" @@ -58,7 +58,7 @@ static CMPIStatus LMI_ProcessorChipEnumInstances( { LMI_ProcessorChip lmi_cpu_chip; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN], *cpu_name = NULL; + char instance_id[BUFLEN], *cpu_name = NULL; short ret1, ret2; unsigned i; DmiProcessor *dmi_cpus = NULL; @@ -75,10 +75,10 @@ static CMPIStatus LMI_ProcessorChipEnumInstances( LMI_ProcessorChip_Init(&lmi_cpu_chip, _cb, ns); LMI_ProcessorChip_Set_CreationClassName(&lmi_cpu_chip, - LMI_ORGID "_" CPU_CHIP_CLASS_NAME); + LMI_ProcessorChip_ClassName); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CHIP_CLASS_NAME ":%s", dmi_cpus[i].id); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorChip_ClassName ":%s", dmi_cpus[i].id); cpu_name = dmi_cpus[i].name; if (!cpu_name || !strlen(cpu_name) diff --git a/src/hardware/LMI_ProcessorChipRealizesProvider.c b/src/hardware/LMI_ProcessorChipRealizesProvider.c index dc50b8d..0f40491 100644 --- a/src/hardware/LMI_ProcessorChipRealizesProvider.c +++ b/src/hardware/LMI_ProcessorChipRealizesProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ProcessorChipRealizes.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -75,12 +75,12 @@ static CMPIStatus LMI_ProcessorChipRealizesEnumInstances( lmi_get_system_creation_class_name()); LMI_ProcessorRef_Set_SystemName(&lmi_cpu, lmi_get_system_name()); LMI_ProcessorRef_Set_CreationClassName(&lmi_cpu, - LMI_ORGID "_" CPU_CLASS_NAME); + LMI_Processor_ClassName); LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); LMI_ProcessorChipRef_Init(&lmi_cpu_chip, _cb, ns); LMI_ProcessorChipRef_Set_CreationClassName(&lmi_cpu_chip, - LMI_ORGID "_" CPU_CHIP_CLASS_NAME); + LMI_ProcessorChip_ClassName); LMI_ProcessorChipRef_Set_Tag(&lmi_cpu_chip, dmi_cpus[i].id); LMI_ProcessorChipRealizes_Set_Antecedent(&lmi_cpu_chip_realizes, diff --git a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c index aa8ed68..61a9fe8 100644 --- a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c @@ -22,7 +22,7 @@ #include "LMI_ProcessorElementCapabilities.h" #include "LMI_ProcessorCapabilities.h" #include "LMI_Processor.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lscpu.h" @@ -62,7 +62,7 @@ static CMPIStatus LMI_ProcessorElementCapabilitiesEnumInstances( LMI_ProcessorCapabilitiesRef lmi_cpu_cap; LMI_ProcessorRef lmi_cpu; const char *ns = KNameSpace(cop); - char *error_msg = NULL, instance_id[INSTANCE_ID_LEN]; + char *error_msg = NULL, instance_id[BUFLEN]; unsigned i, cpus_nb = 0; DmiProcessor *dmi_cpus = NULL; unsigned dmi_cpus_nb = 0; @@ -94,7 +94,7 @@ static CMPIStatus LMI_ProcessorElementCapabilitiesEnumInstances( lmi_get_system_creation_class_name()); LMI_ProcessorRef_Set_SystemName(&lmi_cpu, lmi_get_system_name()); LMI_ProcessorRef_Set_CreationClassName(&lmi_cpu, - LMI_ORGID "_" CPU_CLASS_NAME); + LMI_Processor_ClassName); LMI_ProcessorCapabilitiesRef_Init(&lmi_cpu_cap, _cb, ns); @@ -102,16 +102,16 @@ static CMPIStatus LMI_ProcessorElementCapabilitiesEnumInstances( if (dmi_cpus_nb > 0) { LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%s", dmi_cpus[i].id); } else { char cpu_id[LONG_INT_LEN]; snprintf(cpu_id, LONG_INT_LEN, "%u", i); LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, cpu_id); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%u", i); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%u", i); } LMI_ProcessorCapabilitiesRef_Set_InstanceID(&lmi_cpu_cap, instance_id); 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 #include #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) { diff --git a/src/hardware/LMI_ProcessorSystemDeviceProvider.c b/src/hardware/LMI_ProcessorSystemDeviceProvider.c index 8bf8e3d..761adf0 100644 --- a/src/hardware/LMI_ProcessorSystemDeviceProvider.c +++ b/src/hardware/LMI_ProcessorSystemDeviceProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_ProcessorSystemDevice.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -74,7 +74,7 @@ static CMPIStatus LMI_ProcessorSystemDeviceEnumInstances( lmi_get_system_creation_class_name()); LMI_ProcessorRef_Set_SystemName(&lmi_cpu, lmi_get_system_name()); LMI_ProcessorRef_Set_CreationClassName(&lmi_cpu, - LMI_ORGID "_" CPU_CLASS_NAME); + LMI_Processor_ClassName); LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); LMI_ProcessorSystemDevice_SetObjectPath_GroupComponent( diff --git a/src/hardware/LMI_SystemSlotContainerProvider.c b/src/hardware/LMI_SystemSlotContainerProvider.c index 16139cb..3a9e35f 100644 --- a/src/hardware/LMI_SystemSlotContainerProvider.c +++ b/src/hardware/LMI_SystemSlotContainerProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_SystemSlotContainer.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb; @@ -73,7 +73,7 @@ static CMPIStatus LMI_SystemSlotContainerEnumInstances( LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); LMI_ChassisRef_Set_CreationClassName(&lmi_chassis, - LMI_ORGID "_" CHASSIS_CLASS_NAME); + LMI_Chassis_ClassName); LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); for (i = 0; i < dmi_slots_nb; i++) { @@ -81,7 +81,7 @@ static CMPIStatus LMI_SystemSlotContainerEnumInstances( LMI_SystemSlotRef_Init(&lmi_slot, _cb, ns); LMI_SystemSlotRef_Set_CreationClassName(&lmi_slot, - LMI_ORGID "_" SYSTEM_SLOT_CLASS_NAME); + LMI_SystemSlot_ClassName); LMI_SystemSlotRef_Set_Tag(&lmi_slot, dmi_slots[i].name); LMI_SystemSlotContainer_Set_GroupComponent( diff --git a/src/hardware/LMI_SystemSlotProvider.c b/src/hardware/LMI_SystemSlotProvider.c index 730c242..f88b52f 100644 --- a/src/hardware/LMI_SystemSlotProvider.c +++ b/src/hardware/LMI_SystemSlotProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_SystemSlot.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" CMPIUint16 get_connectorlayout_slot(const char *dmi_val); @@ -61,7 +61,7 @@ static CMPIStatus LMI_SystemSlotEnumInstances( LMI_SystemSlot lmi_slot; const char *ns = KNameSpace(cop); CMPIUint16 conn_layout, maxlinkwidth; - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; unsigned i; DmiSystemSlot *dmi_slots = NULL; unsigned dmi_slots_nb = 0; @@ -74,15 +74,15 @@ static CMPIStatus LMI_SystemSlotEnumInstances( LMI_SystemSlot_Init(&lmi_slot, _cb, ns); LMI_SystemSlot_Set_CreationClassName(&lmi_slot, - LMI_ORGID "_" SYSTEM_SLOT_CLASS_NAME); + LMI_SystemSlot_ClassName); LMI_SystemSlot_Set_Caption(&lmi_slot, "System Slot"); LMI_SystemSlot_Set_Description(&lmi_slot, "This object represents one system slot."); LMI_SystemSlot_Set_ConnectorGender(&lmi_slot, LMI_SystemSlot_ConnectorGender_Female); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" SYSTEM_SLOT_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_SystemSlot_ClassName ":%s", dmi_slots[i].name); conn_layout = get_connectorlayout_slot(dmi_slots[i].type); maxlinkwidth = get_maxlinkwidth(dmi_slots[i].link_width); diff --git a/src/hardware/PCIDev.h b/src/hardware/PCIDev.h index 7a7f936..14f0cd6 100644 --- a/src/hardware/PCIDev.h +++ b/src/hardware/PCIDev.h @@ -24,9 +24,6 @@ #include #include -#define PCI_DEVID_STR_SIZE 55 -#define NAME_BUF_SIZE 128 - /* * Initialize pci access structure. * @param acc pci access structure diff --git a/src/hardware/dmidecode.c b/src/hardware/dmidecode.c index 69afbc4..133d6bb 100644 --- a/src/hardware/dmidecode.c +++ b/src/hardware/dmidecode.c @@ -20,7 +20,6 @@ #include "dmidecode.h" - /****************************************************************************** * DmiProcessor */ diff --git a/src/hardware/dmidecode.h b/src/hardware/dmidecode.h index 5e7cb4a..9bf4549 100644 --- a/src/hardware/dmidecode.h +++ b/src/hardware/dmidecode.h @@ -21,12 +21,8 @@ #ifndef DMIDECODE_H_ #define DMIDECODE_H_ -#include -#include -#include #include "utils.h" - /* Processor from dmidecode. */ typedef struct _DmiProcessor { char *id; /* ID */ @@ -304,5 +300,4 @@ short dmi_get_batteries(DmiBattery **batteries, unsigned *batteries_nb); */ void dmi_free_batteries(DmiBattery **batteries, unsigned *batteries_nb); - #endif /* DMIDECODE_H_ */ diff --git a/src/hardware/lsblk.h b/src/hardware/lsblk.h index bb5cccf..ac62cce 100644 --- a/src/hardware/lsblk.h +++ b/src/hardware/lsblk.h @@ -22,8 +22,9 @@ #define LSBLK_H_ #include -#include #include +#include + #include "utils.h" /* Disk by lsblk program. */ diff --git a/src/hardware/lscpu.c b/src/hardware/lscpu.c index 3407cea..29ae039 100644 --- a/src/hardware/lscpu.c +++ b/src/hardware/lscpu.c @@ -20,7 +20,6 @@ #include "lscpu.h" - /* * Initialize LscpuProcessor attributes. * @param cpu diff --git a/src/hardware/lscpu.h b/src/hardware/lscpu.h index 5526e88..d6e2c19 100644 --- a/src/hardware/lscpu.h +++ b/src/hardware/lscpu.h @@ -21,12 +21,8 @@ #ifndef LSCPU_H_ #define LSCPU_H_ -#include -#include -#include #include "utils.h" - /* Processor from lscpu program. */ typedef struct _LscpuProcessor { unsigned data_width; /* Data width */ @@ -51,5 +47,4 @@ short lscpu_get_processor(LscpuProcessor *cpu); */ void lscpu_free_processor(LscpuProcessor *cpu); - #endif /* LSCPU_H_ */ diff --git a/src/hardware/procfs.c b/src/hardware/procfs.c index 71c3c63..5c8d270 100644 --- a/src/hardware/procfs.c +++ b/src/hardware/procfs.c @@ -20,7 +20,6 @@ #include "procfs.h" - /* * Initialize CpuinfoProcessor attributes. * @param cpu diff --git a/src/hardware/procfs.h b/src/hardware/procfs.h index b0a7174..aa21057 100644 --- a/src/hardware/procfs.h +++ b/src/hardware/procfs.h @@ -21,12 +21,8 @@ #ifndef PROCFS_H_ #define PROCFS_H_ -#include -#include -#include #include "utils.h" - /* Processor from /proc/cpuinfo file. */ typedef struct _CpuinfoProcessor { unsigned flags_nb; /* Number of CPU Flags */ @@ -55,5 +51,4 @@ void cpuinfo_free_processor(CpuinfoProcessor *cpu); */ unsigned long meminfo_get_memory_size(); - #endif /* PROCFS_H_ */ diff --git a/src/hardware/smartctl.h b/src/hardware/smartctl.h index 594f218..d0a3678 100644 --- a/src/hardware/smartctl.h +++ b/src/hardware/smartctl.h @@ -21,14 +21,10 @@ #ifndef SMARTCTL_H_ #define SMARTCTL_H_ -#include -#include -#include -#include -#include #include #include #include + #include "utils.h" #include "sysfs.h" diff --git a/src/hardware/sysfs.c b/src/hardware/sysfs.c index 1e8de84..4a2899f 100644 --- a/src/hardware/sysfs.c +++ b/src/hardware/sysfs.c @@ -20,7 +20,6 @@ #include "sysfs.h" - short path_get_unsigned(const char *path, unsigned *result) { short ret = -1; diff --git a/src/hardware/sysfs.h b/src/hardware/sysfs.h index 2714e2b..4137033 100644 --- a/src/hardware/sysfs.h +++ b/src/hardware/sysfs.h @@ -21,14 +21,10 @@ #ifndef SYSFS_H_ #define SYSFS_H_ -#include -#include -#include #include -#include -#include #include #include + #include "utils.h" #include "dmidecode.h" #include "lscpu.h" @@ -38,7 +34,6 @@ #define SYSFS_KERNEL_MM "/sys/kernel/mm" #define SYSFS_BLOCK_PATH "/sys/class/block" - /* Transparent memory huge pages statuses. */ typedef enum _ThpStatus { thp_unsupported = 0, @@ -111,5 +106,4 @@ short sysfs_get_sizes_of_hugepages(unsigned **sizes, unsigned *sizes_nb); */ ThpStatus sysfs_get_transparent_hugepages_status(); - #endif /* SYSFS_H_ */ diff --git a/src/hardware/utils.c b/src/hardware/utils.c index 1fa6594..150d8e6 100644 --- a/src/hardware/utils.c +++ b/src/hardware/utils.c @@ -20,8 +20,8 @@ #include "utils.h" -const ConfigEntry *provider_config_defaults = NULL; const char *provider_name = "hardware"; +const ConfigEntry *provider_config_defaults = NULL; short read_fp_to_2d_buffer(FILE *fp, char ***buffer, unsigned *buffer_size) { @@ -430,6 +430,6 @@ char *get_part_of_string_between(const char *str, const char *after, const char end_pos[0] = '\0'; out = trim(temp, NULL); - free (temp); + free(temp); return out; } diff --git a/src/hardware/utils.h b/src/hardware/utils.h index 91dfdf5..d1ce713 100644 --- a/src/hardware/utils.h +++ b/src/hardware/utils.h @@ -26,10 +26,14 @@ #include #include #include + #include "openlmi.h" #define LONG_INT_LEN 21 /* 64 bit unsigned int can have 20 decimals + \0 */ +const char *provider_name; +const ConfigEntry *provider_config_defaults; + /* * Read given file pointer and save it's output in buffer. Number of lines read * is stored in buffer_size. Function skips lines starting with '#'. diff --git a/src/hardware/virt_what.c b/src/hardware/virt_what.c index 83fc3d8..ed61a3f 100644 --- a/src/hardware/virt_what.c +++ b/src/hardware/virt_what.c @@ -18,10 +18,8 @@ * Authors: Peter Schiffer */ -#include "utils.h" #include "virt_what.h" - short virt_what_get_virtual_type(char **virt) { short ret = -1; diff --git a/src/hardware/virt_what.h b/src/hardware/virt_what.h index b133136..6f300c7 100644 --- a/src/hardware/virt_what.h +++ b/src/hardware/virt_what.h @@ -21,6 +21,7 @@ #ifndef VIRT_WHAT_H_ #define VIRT_WHAT_H_ +#include "utils.h" /* * Get virtual machine type if running as a virtual machine. If running in @@ -30,5 +31,4 @@ */ short virt_what_get_virtual_type(char **virt); - #endif /* VIRT_WHAT_H_ */ -- cgit