From 81550f470d8224582867054a221445626393d58b Mon Sep 17 00:00:00 2001 From: Radek Novacek Date: Mon, 30 Jul 2012 14:31:30 +0200 Subject: power: use get_system_creation_class_name function in the provider --- src/power/Linux_AssociatedPowerManagementServiceProvider.c | 4 ++-- src/power/Linux_ElementCapabilitiesProvider.c | 3 +-- src/power/Linux_HostedServiceProvider.c | 3 +-- src/power/Linux_PowerManagementServiceProvider.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/power') diff --git a/src/power/Linux_AssociatedPowerManagementServiceProvider.c b/src/power/Linux_AssociatedPowerManagementServiceProvider.c index 31adfc1..d6d6454 100644 --- a/src/power/Linux_AssociatedPowerManagementServiceProvider.c +++ b/src/power/Linux_AssociatedPowerManagementServiceProvider.c @@ -1,7 +1,7 @@ #include "Linux_AssociatedPowerManagementService.h" #include "Linux_PowerManagementService.h" -#include "Linux_ComputerSystem.h" +#include "CIM_ComputerSystem.h" #include "power.h" @@ -65,7 +65,7 @@ static CMPIStatus Linux_AssociatedPowerManagementServiceEnumInstances( Linux_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name()); Linux_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name()); Linux_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "Linux_PowerManagementService"); - Linux_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, "Linux_ComputerSystem"); + Linux_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name()); Linux_AssociatedPowerManagementService_Set_ServiceProvided(&w, &powerManagementServiceRef); int count; diff --git a/src/power/Linux_ElementCapabilitiesProvider.c b/src/power/Linux_ElementCapabilitiesProvider.c index 62c42e6..ee09969 100644 --- a/src/power/Linux_ElementCapabilitiesProvider.c +++ b/src/power/Linux_ElementCapabilitiesProvider.c @@ -1,6 +1,5 @@ #include #include "Linux_ElementCapabilities.h" -#include #include "globals.h" static const CMPIBroker* _cb; @@ -44,7 +43,7 @@ static CMPIStatus Linux_ElementCapabilitiesEnumInstances( Linux_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name()); Linux_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name()); Linux_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "Linux_PowerManagementService"); - Linux_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, "Linux_ComputerSystem"); + Linux_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name()); Linux_ElementCapabilities_Set_ManagedElement(&w, &powerManagementServiceRef); diff --git a/src/power/Linux_HostedServiceProvider.c b/src/power/Linux_HostedServiceProvider.c index 8a65fe9..7b50150 100644 --- a/src/power/Linux_HostedServiceProvider.c +++ b/src/power/Linux_HostedServiceProvider.c @@ -2,7 +2,6 @@ #include #include #include "Linux_HostedService.h" -#include "Linux_ComputerSystem.h" #include "globals.h" @@ -56,7 +55,7 @@ static CMPIStatus Linux_HostedServiceEnumInstances( Linux_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name()); Linux_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name()); Linux_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "Linux_PowerManagementService"); - Linux_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, "Linux_ComputerSystem"); + Linux_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name()); Linux_HostedService_Set_Dependent(&w, &powerManagementServiceRef); KReturnInstance(cr, w); diff --git a/src/power/Linux_PowerManagementServiceProvider.c b/src/power/Linux_PowerManagementServiceProvider.c index ca328a9..053c602 100644 --- a/src/power/Linux_PowerManagementServiceProvider.c +++ b/src/power/Linux_PowerManagementServiceProvider.c @@ -49,7 +49,7 @@ static CMPIStatus Linux_PowerManagementServiceEnumInstances( Linux_PowerManagementService_Init(&w, _cb, KNameSpace(cop)); Linux_PowerManagementService_Set_CreationClassName(&w, "Linux_PowerManagementService"); Linux_PowerManagementService_Set_Name(&w, get_system_name()); - Linux_PowerManagementService_Set_SystemCreationClassName(&w, "Linux_ComputerSystem"); + Linux_PowerManagementService_Set_SystemCreationClassName(&w, get_system_creation_class_name()); Linux_PowerManagementService_Set_SystemName(&w, get_system_name()); /* EnabledState is an integer enumeration that indicates the enabled -- cgit