diff options
author | Peter Schiffer <pschiffe@redhat.com> | 2013-09-25 14:26:09 +0200 |
---|---|---|
committer | Peter Schiffer <pschiffe@redhat.com> | 2013-09-25 14:26:09 +0200 |
commit | cb5d40a7166ea5f4566ce19de49780656c69b1b4 (patch) | |
tree | d1a193e7aedc68ea2d17a544a615053fc1eeb732 /src/hardware | |
parent | 2e20f92522b659b206c907007d6f5757b406bb61 (diff) | |
parent | 3370cfe4beb83a31c0fd5f6e5ac6d8b1c3be9fd5 (diff) | |
download | openlmi-providers-cb5d40a7166ea5f4566ce19de49780656c69b1b4.tar.gz openlmi-providers-cb5d40a7166ea5f4566ce19de49780656c69b1b4.tar.xz openlmi-providers-cb5d40a7166ea5f4566ce19de49780656c69b1b4.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/openlmi-providers
Conflicts:
src/hardware/LMI_PCIBridgeProvider.c
src/hardware/LMI_PCIBridgeSystemDeviceProvider.c
src/hardware/LMI_PCIDeviceProvider.c
src/hardware/LMI_PCIDeviceSystemDeviceProvider.c
Diffstat (limited to 'src/hardware')
38 files changed, 47 insertions, 0 deletions
diff --git a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c index 6310ea9..57a25c2 100644 --- a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c @@ -37,6 +37,7 @@ static const CMPIBroker* _cb; static void LMI_AssociatedProcessorCacheMemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AssociatedProcessorCacheMemoryCleanup( diff --git a/src/hardware/LMI_BaseboardContainerProvider.c b/src/hardware/LMI_BaseboardContainerProvider.c index 22dee90..eac6f26 100644 --- a/src/hardware/LMI_BaseboardContainerProvider.c +++ b/src/hardware/LMI_BaseboardContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_BaseboardContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BaseboardContainerCleanup( diff --git a/src/hardware/LMI_BaseboardProvider.c b/src/hardware/LMI_BaseboardProvider.c index f3a7690..627fc8a 100644 --- a/src/hardware/LMI_BaseboardProvider.c +++ b/src/hardware/LMI_BaseboardProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_BaseboardInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BaseboardCleanup( diff --git a/src/hardware/LMI_BatteryPhysicalPackageProvider.c b/src/hardware/LMI_BatteryPhysicalPackageProvider.c index fbd4888..738e56d 100644 --- a/src/hardware/LMI_BatteryPhysicalPackageProvider.c +++ b/src/hardware/LMI_BatteryPhysicalPackageProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_BatteryPhysicalPackageInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BatteryPhysicalPackageCleanup( diff --git a/src/hardware/LMI_BatteryProvider.c b/src/hardware/LMI_BatteryProvider.c index f5b8e77..91a1004 100644 --- a/src/hardware/LMI_BatteryProvider.c +++ b/src/hardware/LMI_BatteryProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_BatteryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BatteryCleanup( diff --git a/src/hardware/LMI_BatterySystemDeviceProvider.c b/src/hardware/LMI_BatterySystemDeviceProvider.c index 58d59dc..c71de0c 100644 --- a/src/hardware/LMI_BatterySystemDeviceProvider.c +++ b/src/hardware/LMI_BatterySystemDeviceProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_BatterySystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BatterySystemDeviceCleanup( diff --git a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c index 2f8e082..db188e1 100644 --- a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c +++ b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ChassisComputerSystemPackageInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ChassisComputerSystemPackageCleanup( diff --git a/src/hardware/LMI_ChassisProvider.c b/src/hardware/LMI_ChassisProvider.c index 3214d58..5ab2a39 100644 --- a/src/hardware/LMI_ChassisProvider.c +++ b/src/hardware/LMI_ChassisProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ChassisInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ChassisCleanup( diff --git a/src/hardware/LMI_Hardware.h b/src/hardware/LMI_Hardware.h index 7f94055..0ea6237 100644 --- a/src/hardware/LMI_Hardware.h +++ b/src/hardware/LMI_Hardware.h @@ -21,6 +21,11 @@ #ifndef LMI_HARDWARE_H_ #define LMI_HARDWARE_H_ +#include "globals.h" + +const ConfigEntry *provider_config_defaults; +const char *provider_name; + #define INSTANCE_ID_LEN 128 #define ELEMENT_NAME_LEN 128 diff --git a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c index 49f543b..50ea529 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_MemoryPhysicalPackageInConnectorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemoryPhysicalPackageInConnectorCleanup( diff --git a/src/hardware/LMI_MemoryPhysicalPackageProvider.c b/src/hardware/LMI_MemoryPhysicalPackageProvider.c index 0e819eb..f86557d 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_MemoryPhysicalPackageInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemoryPhysicalPackageCleanup( diff --git a/src/hardware/LMI_MemoryProvider.c b/src/hardware/LMI_MemoryProvider.c index 4f2ab7f..f5f9ae8 100644 --- a/src/hardware/LMI_MemoryProvider.c +++ b/src/hardware/LMI_MemoryProvider.c @@ -33,6 +33,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_MemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemoryCleanup( diff --git a/src/hardware/LMI_MemorySlotContainerProvider.c b/src/hardware/LMI_MemorySlotContainerProvider.c index 37c7bce..6cc83b4 100644 --- a/src/hardware/LMI_MemorySlotContainerProvider.c +++ b/src/hardware/LMI_MemorySlotContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_MemorySlotContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemorySlotContainerCleanup( diff --git a/src/hardware/LMI_MemorySlotProvider.c b/src/hardware/LMI_MemorySlotProvider.c index d76be9a..9c72d15 100644 --- a/src/hardware/LMI_MemorySlotProvider.c +++ b/src/hardware/LMI_MemorySlotProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_MemorySlotInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemorySlotCleanup( diff --git a/src/hardware/LMI_MemorySystemDeviceProvider.c b/src/hardware/LMI_MemorySystemDeviceProvider.c index d4d310a..9b25535 100644 --- a/src/hardware/LMI_MemorySystemDeviceProvider.c +++ b/src/hardware/LMI_MemorySystemDeviceProvider.c @@ -27,6 +27,7 @@ static const CMPIBroker* _cb; static void LMI_MemorySystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemorySystemDeviceCleanup( diff --git a/src/hardware/LMI_PCIBridgeProvider.c b/src/hardware/LMI_PCIBridgeProvider.c index ed97a7b..e712626 100644 --- a/src/hardware/LMI_PCIBridgeProvider.c +++ b/src/hardware/LMI_PCIBridgeProvider.c @@ -32,6 +32,8 @@ struct pci_access *acc_bridge = NULL; static void LMI_PCIBridgeInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); + if (init_pci_access(&acc_bridge, PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES diff --git a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c index 6f947ab..2532c38 100644 --- a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c @@ -30,6 +30,8 @@ struct pci_access *acc_system_bridge = NULL; static void LMI_PCIBridgeSystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); + if (init_pci_access(&acc_system_bridge, PCI_FILL_CLASS) != 0) { error("Failed to access the PCI bus."); abort(); diff --git a/src/hardware/LMI_PCIDeviceProvider.c b/src/hardware/LMI_PCIDeviceProvider.c index e2a159b..1a9eeca 100644 --- a/src/hardware/LMI_PCIDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceProvider.c @@ -31,6 +31,8 @@ struct pci_access *acc_dev = NULL; static void LMI_PCIDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); + if (init_pci_access(&acc_dev, PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES diff --git a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c index d7af669..cf8634c 100644 --- a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c @@ -30,6 +30,8 @@ struct pci_access *acc_system_dev = NULL; static void LMI_PCIDeviceSystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); + if (init_pci_access(&acc_system_dev, PCI_FILL_CLASS) != 0) { error("Failed to access the PCI bus."); abort(); diff --git a/src/hardware/LMI_PhysicalBatteryContainerProvider.c b/src/hardware/LMI_PhysicalBatteryContainerProvider.c index 890cd93..67acbb7 100644 --- a/src/hardware/LMI_PhysicalBatteryContainerProvider.c +++ b/src/hardware/LMI_PhysicalBatteryContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalBatteryContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalBatteryContainerCleanup( diff --git a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c index c554fd5..66ab5f7 100644 --- a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalBatteryRealizesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalBatteryRealizesCleanup( diff --git a/src/hardware/LMI_PhysicalMemoryContainerProvider.c b/src/hardware/LMI_PhysicalMemoryContainerProvider.c index 427bef8..57cd994 100644 --- a/src/hardware/LMI_PhysicalMemoryContainerProvider.c +++ b/src/hardware/LMI_PhysicalMemoryContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalMemoryContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryContainerCleanup( diff --git a/src/hardware/LMI_PhysicalMemoryProvider.c b/src/hardware/LMI_PhysicalMemoryProvider.c index 51be88f..53d5256 100644 --- a/src/hardware/LMI_PhysicalMemoryProvider.c +++ b/src/hardware/LMI_PhysicalMemoryProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PhysicalMemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryCleanup( diff --git a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c index 0da8d33..c50e517 100644 --- a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalMemoryRealizesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryRealizesCleanup( diff --git a/src/hardware/LMI_PointingDeviceProvider.c b/src/hardware/LMI_PointingDeviceProvider.c index d5203d2..5fbecb8 100644 --- a/src/hardware/LMI_PointingDeviceProvider.c +++ b/src/hardware/LMI_PointingDeviceProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PointingDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PointingDeviceCleanup( diff --git a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c index d54f678..5b53af3 100644 --- a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PortPhysicalConnectorContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PortPhysicalConnectorContainerCleanup( diff --git a/src/hardware/LMI_PortPhysicalConnectorProvider.c b/src/hardware/LMI_PortPhysicalConnectorProvider.c index 4027928..75f6738 100644 --- a/src/hardware/LMI_PortPhysicalConnectorProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PortPhysicalConnectorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PortPhysicalConnectorCleanup( diff --git a/src/hardware/LMI_ProcessorCacheMemoryProvider.c b/src/hardware/LMI_ProcessorCacheMemoryProvider.c index 2791b95..65c3867 100644 --- a/src/hardware/LMI_ProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_ProcessorCacheMemoryProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorCacheMemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorCacheMemoryCleanup( diff --git a/src/hardware/LMI_ProcessorCapabilitiesProvider.c b/src/hardware/LMI_ProcessorCapabilitiesProvider.c index d398523..b3bf7b6 100644 --- a/src/hardware/LMI_ProcessorCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorCapabilitiesProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorCapabilitiesCleanup( diff --git a/src/hardware/LMI_ProcessorChipContainerProvider.c b/src/hardware/LMI_ProcessorChipContainerProvider.c index b300121..9662380 100644 --- a/src/hardware/LMI_ProcessorChipContainerProvider.c +++ b/src/hardware/LMI_ProcessorChipContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorChipContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipContainerCleanup( diff --git a/src/hardware/LMI_ProcessorChipProvider.c b/src/hardware/LMI_ProcessorChipProvider.c index 1606dce..9949de6 100644 --- a/src/hardware/LMI_ProcessorChipProvider.c +++ b/src/hardware/LMI_ProcessorChipProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorChipInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipCleanup( diff --git a/src/hardware/LMI_ProcessorChipRealizesProvider.c b/src/hardware/LMI_ProcessorChipRealizesProvider.c index 55efba8..6d85c7d 100644 --- a/src/hardware/LMI_ProcessorChipRealizesProvider.c +++ b/src/hardware/LMI_ProcessorChipRealizesProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorChipRealizesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipRealizesCleanup( diff --git a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c index b9b042d..2f25e62 100644 --- a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorElementCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorElementCapabilitiesCleanup( diff --git a/src/hardware/LMI_ProcessorProvider.c b/src/hardware/LMI_ProcessorProvider.c index 8e1c9f5..fbf1d13 100644 --- a/src/hardware/LMI_ProcessorProvider.c +++ b/src/hardware/LMI_ProcessorProvider.c @@ -40,6 +40,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorCleanup( diff --git a/src/hardware/LMI_ProcessorSystemDeviceProvider.c b/src/hardware/LMI_ProcessorSystemDeviceProvider.c index 327f711..2b5112a 100644 --- a/src/hardware/LMI_ProcessorSystemDeviceProvider.c +++ b/src/hardware/LMI_ProcessorSystemDeviceProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorSystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorSystemDeviceCleanup( diff --git a/src/hardware/LMI_SystemSlotContainerProvider.c b/src/hardware/LMI_SystemSlotContainerProvider.c index 7a25254..af39495 100644 --- a/src/hardware/LMI_SystemSlotContainerProvider.c +++ b/src/hardware/LMI_SystemSlotContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_SystemSlotContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SystemSlotContainerCleanup( diff --git a/src/hardware/LMI_SystemSlotProvider.c b/src/hardware/LMI_SystemSlotProvider.c index 3feba71..0de8344 100644 --- a/src/hardware/LMI_SystemSlotProvider.c +++ b/src/hardware/LMI_SystemSlotProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SystemSlotInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SystemSlotCleanup( diff --git a/src/hardware/utils.c b/src/hardware/utils.c index c9deda9..20d9fca 100644 --- a/src/hardware/utils.c +++ b/src/hardware/utils.c @@ -20,6 +20,8 @@ #include "utils.h" +const ConfigEntry *provider_config_defaults = NULL; +const char *provider_name = "hardware"; short read_fp_to_2d_buffer(FILE *fp, char ***buffer, unsigned *buffer_size) { |