diff options
91 files changed, 477 insertions, 581 deletions
diff --git a/src/account/LMI_AccountCapabilitiesProvider.c b/src/account/LMI_AccountCapabilitiesProvider.c index 9526bcc..0ea129c 100644 --- a/src/account/LMI_AccountCapabilitiesProvider.c +++ b/src/account/LMI_AccountCapabilitiesProvider.c @@ -35,9 +35,9 @@ static const CMPIBroker* _cb; -static void LMI_AccountCapabilitiesInitialize() +static void LMI_AccountCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountCapabilitiesCleanup( @@ -272,13 +272,13 @@ CMInstanceMIStub( LMI_AccountCapabilities, LMI_AccountCapabilities, _cb, - LMI_AccountCapabilitiesInitialize()) + LMI_AccountCapabilitiesInitialize(ctx)) CMAssociationMIStub( LMI_AccountCapabilities, LMI_AccountCapabilities, _cb, - LMI_AccountCapabilitiesInitialize()) + LMI_AccountCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountInstanceCreationIndicationProvider.c b/src/account/LMI_AccountInstanceCreationIndicationProvider.c index 7bba103..06fe6e2 100644 --- a/src/account/LMI_AccountInstanceCreationIndicationProvider.c +++ b/src/account/LMI_AccountInstanceCreationIndicationProvider.c @@ -33,9 +33,9 @@ static const CMPIBroker* _cb = NULL; static IMManager *im = NULL; static IMError im_err = IM_ERR_OK; -static void LMI_AccountInstanceCreationIndicationInitialize() +static void LMI_AccountInstanceCreationIndicationInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); im = im_create_manager(NULL, filter_checker, true, watcher, IM_IND_CREATION, _cb, &im_err); } @@ -128,7 +128,7 @@ CMIndicationMIStub( LMI_AccountInstanceCreationIndication, LMI_AccountInstanceCreationIndication, _cb, - LMI_AccountInstanceCreationIndicationInitialize()) + LMI_AccountInstanceCreationIndicationInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c index ae6e4e3..81a0e18 100644 --- a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c +++ b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c @@ -36,9 +36,9 @@ static const CMPIBroker* _cb = NULL; static IMManager *im = NULL; static IMError im_err = IM_ERR_OK; -static void LMI_AccountInstanceDeletionIndicationInitialize() +static void LMI_AccountInstanceDeletionIndicationInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); im = im_create_manager(NULL, filter_checker, true, watcher, IM_IND_DELETION, _cb, &im_err); } @@ -131,7 +131,7 @@ CMIndicationMIStub( LMI_AccountInstanceDeletionIndication, LMI_AccountInstanceDeletionIndication, _cb, - LMI_AccountInstanceDeletionIndicationInitialize()) + LMI_AccountInstanceDeletionIndicationInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountManagementCapabilitiesProvider.c b/src/account/LMI_AccountManagementCapabilitiesProvider.c index 445b5ea..7ea78ed 100644 --- a/src/account/LMI_AccountManagementCapabilitiesProvider.c +++ b/src/account/LMI_AccountManagementCapabilitiesProvider.c @@ -31,9 +31,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_AccountManagementCapabilitiesInitialize() +static void LMI_AccountManagementCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountManagementCapabilitiesCleanup( @@ -155,7 +155,7 @@ CMInstanceMIStub( LMI_AccountManagementCapabilities, LMI_AccountManagementCapabilities, _cb, - LMI_AccountManagementCapabilitiesInitialize()) + LMI_AccountManagementCapabilitiesInitialize(ctx)) static CMPIStatus LMI_AccountManagementCapabilitiesMethodCleanup( CMPIMethodMI* mi, @@ -197,7 +197,7 @@ CMMethodMIStub( LMI_AccountManagementCapabilities, LMI_AccountManagementCapabilities, _cb, - LMI_AccountManagementCapabilitiesInitialize()) + LMI_AccountManagementCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c index faa0dd8..2abe70b 100644 --- a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c +++ b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c @@ -29,9 +29,9 @@ static const CMPIBroker* _cb; -static void LMI_AccountManagementServiceCapabilitiesInitialize() +static void LMI_AccountManagementServiceCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountManagementServiceCapabilitiesCleanup( @@ -241,13 +241,13 @@ CMInstanceMIStub( LMI_AccountManagementServiceCapabilities, LMI_AccountManagementServiceCapabilities, _cb, - LMI_AccountManagementServiceCapabilitiesInitialize()) + LMI_AccountManagementServiceCapabilitiesInitialize(ctx)) CMAssociationMIStub( LMI_AccountManagementServiceCapabilities, LMI_AccountManagementServiceCapabilities, _cb, - LMI_AccountManagementServiceCapabilitiesInitialize()) + LMI_AccountManagementServiceCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountManagementServiceProvider.c b/src/account/LMI_AccountManagementServiceProvider.c index 3aac63d..df58a53 100644 --- a/src/account/LMI_AccountManagementServiceProvider.c +++ b/src/account/LMI_AccountManagementServiceProvider.c @@ -50,9 +50,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_AccountManagementServiceInitialize() +static void LMI_AccountManagementServiceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountManagementServiceCleanup( @@ -157,7 +157,7 @@ CMInstanceMIStub( LMI_AccountManagementService, LMI_AccountManagementService, _cb, - LMI_AccountManagementServiceInitialize()) + LMI_AccountManagementServiceInitialize(ctx)) static CMPIStatus LMI_AccountManagementServiceMethodCleanup( CMPIMethodMI* mi, @@ -184,7 +184,7 @@ CMMethodMIStub( LMI_AccountManagementService, LMI_AccountManagementService, _cb, - LMI_AccountManagementServiceInitialize()) + LMI_AccountManagementServiceInitialize(ctx)) KUint32 LMI_AccountManagementService_RequestStateChange( const CMPIBroker* cb, diff --git a/src/account/LMI_AccountManagementServiceSettingDataProvider.c b/src/account/LMI_AccountManagementServiceSettingDataProvider.c index 00131a3..f75929f 100644 --- a/src/account/LMI_AccountManagementServiceSettingDataProvider.c +++ b/src/account/LMI_AccountManagementServiceSettingDataProvider.c @@ -25,9 +25,9 @@ static const CMPIBroker* _cb; -static void LMI_AccountManagementServiceSettingDataInitialize() +static void LMI_AccountManagementServiceSettingDataInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountManagementServiceSettingDataCleanup( @@ -210,13 +210,13 @@ CMInstanceMIStub( LMI_AccountManagementServiceSettingData, LMI_AccountManagementServiceSettingData, _cb, - LMI_AccountManagementServiceSettingDataInitialize()) + LMI_AccountManagementServiceSettingDataInitialize(ctx)) CMAssociationMIStub( LMI_AccountManagementServiceSettingData, LMI_AccountManagementServiceSettingData, _cb, - LMI_AccountManagementServiceSettingDataInitialize()) + LMI_AccountManagementServiceSettingDataInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountOnSystemProvider.c b/src/account/LMI_AccountOnSystemProvider.c index e78763d..9319484 100644 --- a/src/account/LMI_AccountOnSystemProvider.c +++ b/src/account/LMI_AccountOnSystemProvider.c @@ -35,9 +35,9 @@ static const CMPIBroker* _cb; -static void LMI_AccountOnSystemInitialize() +static void LMI_AccountOnSystemInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountOnSystemCleanup( @@ -66,12 +66,8 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances( const char** properties) { LMI_AccountRef laref; - CIM_ComputerSystemRef lcsref; LMI_AccountOnSystem laos; - CMPIObjectPath *computerSystemOP = NULL; - CMPIStatus rc; - struct lu_context *luc = NULL; struct lu_error *error = NULL; GPtrArray *accounts = NULL; @@ -81,15 +77,6 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances( const char *nameSpace = KNameSpace(cop); const char *hostname = get_system_name(); - CIM_ComputerSystemRef_Init(&lcsref, _cb, nameSpace); - CIM_ComputerSystemRef_Set_Name(&lcsref, hostname); - CIM_ComputerSystemRef_Set_CreationClassName(&lcsref, - get_system_creation_class_name()); - - computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&lcsref, &rc); - computerSystemOP->ft->setClassName(computerSystemOP, - get_system_creation_class_name()); - luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error); if (!luc) { @@ -110,8 +97,9 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances( LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME)); LMI_AccountOnSystem_Init(&laos, _cb, nameSpace); + KPrintObjectPath(stderr, lmi_get_computer_system(), 1); LMI_AccountOnSystem_SetObjectPath_GroupComponent(&laos, - computerSystemOP); + lmi_get_computer_system()); LMI_AccountOnSystem_Set_PartComponent(&laos, &laref); KReturnInstance(cr, laos); @@ -279,13 +267,13 @@ CMInstanceMIStub( LMI_AccountOnSystem, LMI_AccountOnSystem, _cb, - LMI_AccountOnSystemInitialize()) + LMI_AccountOnSystemInitialize(ctx)) CMAssociationMIStub( LMI_AccountOnSystem, LMI_AccountOnSystem, _cb, - LMI_AccountOnSystemInitialize()) + LMI_AccountOnSystemInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AccountProvider.c b/src/account/LMI_AccountProvider.c index d8e279a..cde4792 100644 --- a/src/account/LMI_AccountProvider.c +++ b/src/account/LMI_AccountProvider.c @@ -58,9 +58,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_AccountInitialize() +static void LMI_AccountInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); if (init_lock_pool() == 0) { error("Unable to initialize lock pool."); exit (1); @@ -647,7 +647,7 @@ CMInstanceMIStub( LMI_Account, LMI_Account, _cb, - LMI_AccountInitialize()) + LMI_AccountInitialize(ctx)) static CMPIStatus LMI_AccountMethodCleanup( CMPIMethodMI* mi, @@ -675,7 +675,7 @@ CMMethodMIStub( LMI_Account, LMI_Account, _cb, - LMI_AccountInitialize()) + LMI_AccountInitialize(ctx)) KUint32 LMI_Account_RequestStateChange( const CMPIBroker* cb, diff --git a/src/account/LMI_AccountSettingDataProvider.c b/src/account/LMI_AccountSettingDataProvider.c index 4061db8..be76c80 100644 --- a/src/account/LMI_AccountSettingDataProvider.c +++ b/src/account/LMI_AccountSettingDataProvider.c @@ -30,9 +30,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_AccountSettingDataInitialize() +static void LMI_AccountSettingDataInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AccountSettingDataCleanup( @@ -119,7 +119,7 @@ CMInstanceMIStub( LMI_AccountSettingData, LMI_AccountSettingData, _cb, - LMI_AccountSettingDataInitialize()) + LMI_AccountSettingDataInitialize(ctx)) static CMPIStatus LMI_AccountSettingDataMethodCleanup( CMPIMethodMI* mi, @@ -146,7 +146,7 @@ CMMethodMIStub( LMI_AccountSettingData, LMI_AccountSettingData, _cb, - LMI_AccountSettingDataInitialize()) + LMI_AccountSettingDataInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AssignedAccountIdentityProvider.c b/src/account/LMI_AssignedAccountIdentityProvider.c index 9a9c272..8ef308d 100644 --- a/src/account/LMI_AssignedAccountIdentityProvider.c +++ b/src/account/LMI_AssignedAccountIdentityProvider.c @@ -33,9 +33,9 @@ static const CMPIBroker* _cb; -static void LMI_AssignedAccountIdentityInitialize() +static void LMI_AssignedAccountIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AssignedAccountIdentityCleanup( @@ -269,13 +269,13 @@ CMInstanceMIStub( LMI_AssignedAccountIdentity, LMI_AssignedAccountIdentity, _cb, - LMI_AssignedAccountIdentityInitialize()) + LMI_AssignedAccountIdentityInitialize(ctx)) CMAssociationMIStub( LMI_AssignedAccountIdentity, LMI_AssignedAccountIdentity, _cb, - LMI_AssignedAccountIdentityInitialize()) + LMI_AssignedAccountIdentityInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_AssignedGroupIdentityProvider.c b/src/account/LMI_AssignedGroupIdentityProvider.c index d406b3c..5b673db 100644 --- a/src/account/LMI_AssignedGroupIdentityProvider.c +++ b/src/account/LMI_AssignedGroupIdentityProvider.c @@ -33,9 +33,9 @@ static const CMPIBroker* _cb; -static void LMI_AssignedGroupIdentityInitialize() +static void LMI_AssignedGroupIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AssignedGroupIdentityCleanup( @@ -258,13 +258,13 @@ CMInstanceMIStub( LMI_AssignedGroupIdentity, LMI_AssignedGroupIdentity, _cb, - LMI_AssignedGroupIdentityInitialize()) + LMI_AssignedGroupIdentityInitialize(ctx)) CMAssociationMIStub( LMI_AssignedGroupIdentity, LMI_AssignedGroupIdentity, _cb, - LMI_AssignedGroupIdentityInitialize()) + LMI_AssignedGroupIdentityInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_EnabledAccountCapabilitiesProvider.c b/src/account/LMI_EnabledAccountCapabilitiesProvider.c index e014024..27f2f07 100644 --- a/src/account/LMI_EnabledAccountCapabilitiesProvider.c +++ b/src/account/LMI_EnabledAccountCapabilitiesProvider.c @@ -29,9 +29,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_EnabledAccountCapabilitiesInitialize() +static void LMI_EnabledAccountCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_EnabledAccountCapabilitiesCleanup( @@ -131,7 +131,7 @@ CMInstanceMIStub( LMI_EnabledAccountCapabilities, LMI_EnabledAccountCapabilities, _cb, - LMI_EnabledAccountCapabilitiesInitialize()) + LMI_EnabledAccountCapabilitiesInitialize(ctx)) static CMPIStatus LMI_EnabledAccountCapabilitiesMethodCleanup( CMPIMethodMI* mi, @@ -158,7 +158,7 @@ CMMethodMIStub( LMI_EnabledAccountCapabilities, LMI_EnabledAccountCapabilities, _cb, - LMI_EnabledAccountCapabilitiesInitialize()) + LMI_EnabledAccountCapabilitiesInitialize(ctx)) KUint16 LMI_EnabledAccountCapabilities_CreateGoalSettings( const CMPIBroker* cb, diff --git a/src/account/LMI_GroupProvider.c b/src/account/LMI_GroupProvider.c index ff1955c..c19646d 100644 --- a/src/account/LMI_GroupProvider.c +++ b/src/account/LMI_GroupProvider.c @@ -39,9 +39,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_GroupInitialize() +static void LMI_GroupInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_GroupCleanup( @@ -250,7 +250,7 @@ CMInstanceMIStub( LMI_Group, LMI_Group, _cb, - LMI_GroupInitialize()) + LMI_GroupInitialize(ctx)) static CMPIStatus LMI_GroupMethodCleanup( CMPIMethodMI* mi, @@ -304,7 +304,7 @@ CMMethodMIStub( LMI_Group, LMI_Group, _cb, - LMI_GroupInitialize()) + LMI_GroupInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_HostedAccountManagementServiceProvider.c b/src/account/LMI_HostedAccountManagementServiceProvider.c index b605f87..69c89e7 100644 --- a/src/account/LMI_HostedAccountManagementServiceProvider.c +++ b/src/account/LMI_HostedAccountManagementServiceProvider.c @@ -29,9 +29,9 @@ static const CMPIBroker* _cb; -static void LMI_HostedAccountManagementServiceInitialize() +static void LMI_HostedAccountManagementServiceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_HostedAccountManagementServiceCleanup( @@ -59,25 +59,12 @@ static CMPIStatus LMI_HostedAccountManagementServiceEnumInstances( const CMPIObjectPath* cop, const char** properties) { - CIM_ComputerSystemRef lcsref; LMI_AccountManagementServiceRef lamsref; LMI_HostedAccountManagementService lhs; - CMPIObjectPath *computerSystemOP = NULL; - CMPIStatus rc; - const char *nameSpace = KNameSpace(cop); const char *hostname = get_system_name(); - CIM_ComputerSystemRef_Init(&lcsref, _cb, nameSpace); - CIM_ComputerSystemRef_Set_Name(&lcsref, hostname); - CIM_ComputerSystemRef_Set_CreationClassName(&lcsref, - get_system_creation_class_name()); - - computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&lcsref, &rc); - computerSystemOP->ft->setClassName(computerSystemOP, - get_system_creation_class_name()); - LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace); LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME); LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref, @@ -87,7 +74,8 @@ static CMPIStatus LMI_HostedAccountManagementServiceEnumInstances( LMI_AccountManagementService_ClassName); LMI_HostedAccountManagementService_Init(&lhs, _cb, nameSpace); - LMI_HostedAccountManagementService_SetObjectPath_Antecedent(&lhs, computerSystemOP); + LMI_HostedAccountManagementService_SetObjectPath_Antecedent(&lhs, + lmi_get_computer_system()); LMI_HostedAccountManagementService_Set_Dependent(&lhs, &lamsref); KReturnInstance(cr, lhs); @@ -246,13 +234,13 @@ CMInstanceMIStub( LMI_HostedAccountManagementService, LMI_HostedAccountManagementService, _cb, - LMI_HostedAccountManagementServiceInitialize()) + LMI_HostedAccountManagementServiceInitialize(ctx)) CMAssociationMIStub( LMI_HostedAccountManagementService, LMI_HostedAccountManagementService, _cb, - LMI_HostedAccountManagementServiceInitialize()) + LMI_HostedAccountManagementServiceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_IdentityProvider.c b/src/account/LMI_IdentityProvider.c index a86a5f7..df3ffe7 100644 --- a/src/account/LMI_IdentityProvider.c +++ b/src/account/LMI_IdentityProvider.c @@ -31,9 +31,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_IdentityInitialize() +static void LMI_IdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_IdentityCleanup( @@ -251,7 +251,7 @@ CMInstanceMIStub( LMI_Identity, LMI_Identity, _cb, - LMI_IdentityInitialize()) + LMI_IdentityInitialize(ctx)) static CMPIStatus LMI_IdentityMethodCleanup( CMPIMethodMI* mi, @@ -278,7 +278,7 @@ CMMethodMIStub( LMI_Identity, LMI_Identity, _cb, - LMI_IdentityInitialize()) + LMI_IdentityInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_MemberOfGroupProvider.c b/src/account/LMI_MemberOfGroupProvider.c index 4e2212e..1751e41 100644 --- a/src/account/LMI_MemberOfGroupProvider.c +++ b/src/account/LMI_MemberOfGroupProvider.c @@ -34,9 +34,9 @@ static const CMPIBroker* _cb; -static void LMI_MemberOfGroupInitialize() +static void LMI_MemberOfGroupInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemberOfGroupCleanup( @@ -448,13 +448,13 @@ CMInstanceMIStub( LMI_MemberOfGroup, LMI_MemberOfGroup, _cb, - LMI_MemberOfGroupInitialize()) + LMI_MemberOfGroupInitialize(ctx)) CMAssociationMIStub( LMI_MemberOfGroup, LMI_MemberOfGroup, _cb, - LMI_MemberOfGroupInitialize()) + LMI_MemberOfGroupInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_OwningGroupProvider.c b/src/account/LMI_OwningGroupProvider.c index a7506f8..12ea99a 100644 --- a/src/account/LMI_OwningGroupProvider.c +++ b/src/account/LMI_OwningGroupProvider.c @@ -33,9 +33,9 @@ static const CMPIBroker* _cb; -static void LMI_OwningGroupInitialize() +static void LMI_OwningGroupInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_OwningGroupCleanup( @@ -63,13 +63,9 @@ static CMPIStatus LMI_OwningGroupEnumInstances( const CMPIObjectPath* cop, const char** properties) { - CIM_ComputerSystemRef lcsref; LMI_GroupRef lgref; LMI_OwningGroup log; - CMPIObjectPath *computerSystemOP = NULL; - CMPIStatus rc; - struct lu_context *luc = NULL; struct lu_error *error = NULL; GPtrArray *groups = NULL; @@ -77,16 +73,6 @@ static CMPIStatus LMI_OwningGroupEnumInstances( size_t i; const char *nameSpace = KNameSpace(cop); - const char *hostname = get_system_name(); - - CIM_ComputerSystemRef_Init(&lcsref, _cb, nameSpace); - CIM_ComputerSystemRef_Set_Name(&lcsref, hostname); - CIM_ComputerSystemRef_Set_CreationClassName(&lcsref, - get_system_creation_class_name()); - - computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&lcsref, &rc); - computerSystemOP->ft->setClassName(computerSystemOP, - get_system_creation_class_name()); luc = lu_start(NULL, lu_group, NULL, NULL, lu_prompt_console_quiet, NULL, &error); if (!luc) @@ -104,7 +90,8 @@ static CMPIStatus LMI_OwningGroupEnumInstances( LMI_GroupRef_Set_CreationClassName(&lgref, LMI_Group_ClassName); LMI_OwningGroup_Init(&log, _cb, nameSpace); - LMI_OwningGroup_SetObjectPath_OwningElement(&log, computerSystemOP); + LMI_OwningGroup_SetObjectPath_OwningElement(&log, + lmi_get_computer_system()); LMI_OwningGroup_Set_OwnedElement(&log, &lgref); KReturnInstance(cr, log); @@ -273,13 +260,13 @@ CMInstanceMIStub( LMI_OwningGroup, LMI_OwningGroup, _cb, - LMI_OwningGroupInitialize()) + LMI_OwningGroupInitialize(ctx)) CMAssociationMIStub( LMI_OwningGroup, LMI_OwningGroup, _cb, - LMI_OwningGroupInitialize()) + LMI_OwningGroupInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_ServiceAffectsIdentityProvider.c b/src/account/LMI_ServiceAffectsIdentityProvider.c index 8b46ebd..5b257ac 100644 --- a/src/account/LMI_ServiceAffectsIdentityProvider.c +++ b/src/account/LMI_ServiceAffectsIdentityProvider.c @@ -33,9 +33,9 @@ static const CMPIBroker* _cb; -static void LMI_ServiceAffectsIdentityInitialize() +static void LMI_ServiceAffectsIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ServiceAffectsIdentityCleanup( @@ -305,13 +305,13 @@ CMInstanceMIStub( LMI_ServiceAffectsIdentity, LMI_ServiceAffectsIdentity, _cb, - LMI_ServiceAffectsIdentityInitialize()) + LMI_ServiceAffectsIdentityInitialize(ctx)) CMAssociationMIStub( LMI_ServiceAffectsIdentity, LMI_ServiceAffectsIdentity, _cb, - LMI_ServiceAffectsIdentityInitialize()) + LMI_ServiceAffectsIdentityInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c index c8f545a..203640c 100644 --- a/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c +++ b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c @@ -25,9 +25,9 @@ static const CMPIBroker* _cb; -static void LMI_SettingsDefineAccountCapabilitiesInitialize() +static void LMI_SettingsDefineAccountCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SettingsDefineAccountCapabilitiesCleanup( @@ -210,13 +210,13 @@ CMInstanceMIStub( LMI_SettingsDefineAccountCapabilities, LMI_SettingsDefineAccountCapabilities, _cb, - LMI_SettingsDefineAccountCapabilitiesInitialize()) + LMI_SettingsDefineAccountCapabilitiesInitialize(ctx)) CMAssociationMIStub( LMI_SettingsDefineAccountCapabilities, LMI_SettingsDefineAccountCapabilities, _cb, - LMI_SettingsDefineAccountCapabilitiesInitialize()) + LMI_SettingsDefineAccountCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c index fdfd1f0..82f8b25 100644 --- a/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c +++ b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c @@ -25,9 +25,9 @@ static const CMPIBroker* _cb; -static void LMI_SettingsDefineManagementCapabilitiesInitialize() +static void LMI_SettingsDefineManagementCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SettingsDefineManagementCapabilitiesCleanup( @@ -210,13 +210,13 @@ CMInstanceMIStub( LMI_SettingsDefineManagementCapabilities, LMI_SettingsDefineManagementCapabilities, _cb, - LMI_SettingsDefineManagementCapabilitiesInitialize()) + LMI_SettingsDefineManagementCapabilitiesInitialize(ctx)) CMAssociationMIStub( LMI_SettingsDefineManagementCapabilities, LMI_SettingsDefineManagementCapabilities, _cb, - LMI_SettingsDefineManagementCapabilitiesInitialize()) + LMI_SettingsDefineManagementCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/fan/LMI_FanAssociatedSensorProvider.c b/src/fan/LMI_FanAssociatedSensorProvider.c index a70adcb..63ca68f 100644 --- a/src/fan/LMI_FanAssociatedSensorProvider.c +++ b/src/fan/LMI_FanAssociatedSensorProvider.c @@ -25,9 +25,9 @@ static const CMPIBroker* _cb; -static void LMI_FanAssociatedSensorInitialize() +static void LMI_FanAssociatedSensorInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); init_linux_fan_module(); } @@ -253,13 +253,13 @@ CMInstanceMIStub( LMI_FanAssociatedSensor, LMI_FanAssociatedSensor, _cb, - LMI_FanAssociatedSensorInitialize()) + LMI_FanAssociatedSensorInitialize(ctx)) CMAssociationMIStub( LMI_FanAssociatedSensor, LMI_FanAssociatedSensor, _cb, - LMI_FanAssociatedSensorInitialize()) + LMI_FanAssociatedSensorInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/fan/LMI_FanProvider.c b/src/fan/LMI_FanProvider.c index 2a82551..98eba4f 100644 --- a/src/fan/LMI_FanProvider.c +++ b/src/fan/LMI_FanProvider.c @@ -26,9 +26,9 @@ #include "fan.h" static const CMPIBroker* _cb = NULL; -static void LMI_FanInitialize() +static void LMI_FanInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); init_linux_fan_module(); } @@ -237,7 +237,7 @@ CMInstanceMIStub( LMI_Fan, LMI_Fan, _cb, - LMI_FanInitialize()) + LMI_FanInitialize(ctx)) static CMPIStatus LMI_FanMethodCleanup( CMPIMethodMI* mi, @@ -264,7 +264,7 @@ CMMethodMIStub( LMI_Fan, LMI_Fan, _cb, - LMI_FanInitialize()) + LMI_FanInitialize(ctx)) KUint32 LMI_Fan_RequestStateChange( const CMPIBroker* cb, diff --git a/src/fan/LMI_FanSensorProvider.c b/src/fan/LMI_FanSensorProvider.c index ff459d2..21b9e92 100644 --- a/src/fan/LMI_FanSensorProvider.c +++ b/src/fan/LMI_FanSensorProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_FanSensorInitialize() +static void LMI_FanSensorInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); init_linux_fan_module(); } @@ -234,7 +234,7 @@ CMInstanceMIStub( LMI_FanSensor, LMI_FanSensor, _cb, - LMI_FanSensorInitialize()) + LMI_FanSensorInitialize(ctx)) static CMPIStatus LMI_FanSensorMethodCleanup( CMPIMethodMI* mi, @@ -261,7 +261,7 @@ CMMethodMIStub( LMI_FanSensor, LMI_FanSensor, _cb, - LMI_FanSensorInitialize()) + LMI_FanSensorInitialize(ctx)) KUint32 LMI_FanSensor_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c index 57a25c2..7f0c9b7 100644 --- a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c @@ -35,9 +35,9 @@ CMPIUint16 get_cache_associativity_sysfs(const unsigned ways_of_assoc); static const CMPIBroker* _cb; -static void LMI_AssociatedProcessorCacheMemoryInitialize() +static void LMI_AssociatedProcessorCacheMemoryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_AssociatedProcessorCacheMemoryCleanup( @@ -628,13 +628,13 @@ CMInstanceMIStub( LMI_AssociatedProcessorCacheMemory, LMI_AssociatedProcessorCacheMemory, _cb, - LMI_AssociatedProcessorCacheMemoryInitialize()) + LMI_AssociatedProcessorCacheMemoryInitialize(ctx)) CMAssociationMIStub( LMI_AssociatedProcessorCacheMemory, LMI_AssociatedProcessorCacheMemory, _cb, - LMI_AssociatedProcessorCacheMemoryInitialize()) + LMI_AssociatedProcessorCacheMemoryInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_BaseboardContainerProvider.c b/src/hardware/LMI_BaseboardContainerProvider.c index eac6f26..689361a 100644 --- a/src/hardware/LMI_BaseboardContainerProvider.c +++ b/src/hardware/LMI_BaseboardContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_BaseboardContainerInitialize() +static void LMI_BaseboardContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_BaseboardContainerCleanup( @@ -253,13 +253,13 @@ CMInstanceMIStub( LMI_BaseboardContainer, LMI_BaseboardContainer, _cb, - LMI_BaseboardContainerInitialize()) + LMI_BaseboardContainerInitialize(ctx)) CMAssociationMIStub( LMI_BaseboardContainer, LMI_BaseboardContainer, _cb, - LMI_BaseboardContainerInitialize()) + LMI_BaseboardContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_BaseboardProvider.c b/src/hardware/LMI_BaseboardProvider.c index 627fc8a..a0049aa 100644 --- a/src/hardware/LMI_BaseboardProvider.c +++ b/src/hardware/LMI_BaseboardProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_BaseboardInitialize() +static void LMI_BaseboardInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_BaseboardCleanup( @@ -158,7 +158,7 @@ CMInstanceMIStub( LMI_Baseboard, LMI_Baseboard, _cb, - LMI_BaseboardInitialize()) + LMI_BaseboardInitialize(ctx)) static CMPIStatus LMI_BaseboardMethodCleanup( CMPIMethodMI* mi, @@ -185,7 +185,7 @@ CMMethodMIStub( LMI_Baseboard, LMI_Baseboard, _cb, - LMI_BaseboardInitialize()) + LMI_BaseboardInitialize(ctx)) KUint32 LMI_Baseboard_IsCompatible( const CMPIBroker* cb, diff --git a/src/hardware/LMI_BatteryPhysicalPackageProvider.c b/src/hardware/LMI_BatteryPhysicalPackageProvider.c index 738e56d..33446d8 100644 --- a/src/hardware/LMI_BatteryPhysicalPackageProvider.c +++ b/src/hardware/LMI_BatteryPhysicalPackageProvider.c @@ -27,9 +27,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_BatteryPhysicalPackageInitialize() +static void LMI_BatteryPhysicalPackageInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_BatteryPhysicalPackageCleanup( @@ -168,7 +168,7 @@ CMInstanceMIStub( LMI_BatteryPhysicalPackage, LMI_BatteryPhysicalPackage, _cb, - LMI_BatteryPhysicalPackageInitialize()) + LMI_BatteryPhysicalPackageInitialize(ctx)) static CMPIStatus LMI_BatteryPhysicalPackageMethodCleanup( CMPIMethodMI* mi, @@ -195,7 +195,7 @@ CMMethodMIStub( LMI_BatteryPhysicalPackage, LMI_BatteryPhysicalPackage, _cb, - LMI_BatteryPhysicalPackageInitialize()) + LMI_BatteryPhysicalPackageInitialize(ctx)) KUint32 LMI_BatteryPhysicalPackage_IsCompatible( const CMPIBroker* cb, diff --git a/src/hardware/LMI_BatteryProvider.c b/src/hardware/LMI_BatteryProvider.c index 91a1004..d2e14ad 100644 --- a/src/hardware/LMI_BatteryProvider.c +++ b/src/hardware/LMI_BatteryProvider.c @@ -28,9 +28,9 @@ CMPIUint16 get_chemistry(const char *dmi_val); static const CMPIBroker* _cb = NULL; -static void LMI_BatteryInitialize() +static void LMI_BatteryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_BatteryCleanup( @@ -168,7 +168,7 @@ CMInstanceMIStub( LMI_Battery, LMI_Battery, _cb, - LMI_BatteryInitialize()) + LMI_BatteryInitialize(ctx)) static CMPIStatus LMI_BatteryMethodCleanup( CMPIMethodMI* mi, @@ -195,7 +195,7 @@ CMMethodMIStub( LMI_Battery, LMI_Battery, _cb, - LMI_BatteryInitialize()) + LMI_BatteryInitialize(ctx)) KUint32 LMI_Battery_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_BatterySystemDeviceProvider.c b/src/hardware/LMI_BatterySystemDeviceProvider.c index c71de0c..5ca3675 100644 --- a/src/hardware/LMI_BatterySystemDeviceProvider.c +++ b/src/hardware/LMI_BatterySystemDeviceProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_BatterySystemDeviceInitialize() +static void LMI_BatterySystemDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_BatterySystemDeviceCleanup( @@ -57,10 +57,7 @@ static CMPIStatus LMI_BatterySystemDeviceEnumInstances( const char** properties) { LMI_BatterySystemDevice lmi_batt_sys_device; - CIM_ComputerSystemRef cim_cs; LMI_BatteryRef lmi_batt; - CMPIObjectPath *o; - CMPIStatus st; const char *ns = KNameSpace(cop); unsigned i; DmiBattery *dmi_batt = NULL; @@ -70,13 +67,6 @@ static CMPIStatus LMI_BatterySystemDeviceEnumInstances( goto done; } - CIM_ComputerSystemRef_Init(&cim_cs, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_cs, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_cs, - get_system_creation_class_name()); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_cs, &st); - CMSetClassName(o, get_system_creation_class_name()); - for (i = 0; i < dmi_batt_nb; i++) { LMI_BatterySystemDevice_Init(&lmi_batt_sys_device, _cb, ns); @@ -89,7 +79,7 @@ static CMPIStatus LMI_BatterySystemDeviceEnumInstances( LMI_BatteryRef_Set_DeviceID(&lmi_batt, dmi_batt[i].name); LMI_BatterySystemDevice_SetObjectPath_GroupComponent( - &lmi_batt_sys_device, o); + &lmi_batt_sys_device, lmi_get_computer_system()); LMI_BatterySystemDevice_Set_PartComponent(&lmi_batt_sys_device, &lmi_batt); @@ -254,13 +244,13 @@ CMInstanceMIStub( LMI_BatterySystemDevice, LMI_BatterySystemDevice, _cb, - LMI_BatterySystemDeviceInitialize()) + LMI_BatterySystemDeviceInitialize(ctx)) CMAssociationMIStub( LMI_BatterySystemDevice, LMI_BatterySystemDevice, _cb, - LMI_BatterySystemDeviceInitialize()) + LMI_BatterySystemDeviceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c index db188e1..8289d9f 100644 --- a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c +++ b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_ChassisComputerSystemPackageInitialize() +static void LMI_ChassisComputerSystemPackageInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ChassisComputerSystemPackageCleanup( @@ -57,10 +57,7 @@ static CMPIStatus LMI_ChassisComputerSystemPackageEnumInstances( const char** properties) { LMI_ChassisComputerSystemPackage lmi_chassis_cs_pkg; - CIM_ComputerSystemRef cim_cs; LMI_ChassisRef lmi_chassis; - CMPIObjectPath *o; - CMPIStatus st; const char *ns = KNameSpace(cop); DmiChassis dmi_chassis; @@ -68,13 +65,6 @@ static CMPIStatus LMI_ChassisComputerSystemPackageEnumInstances( goto done; } - CIM_ComputerSystemRef_Init(&cim_cs, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_cs, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_cs, - get_system_creation_class_name()); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_cs, &st); - CMSetClassName(o, get_system_creation_class_name()); - LMI_ChassisComputerSystemPackage_Init(&lmi_chassis_cs_pkg, _cb, ns); LMI_ChassisRef_Init(&lmi_chassis, _cb, ns); @@ -83,7 +73,7 @@ static CMPIStatus LMI_ChassisComputerSystemPackageEnumInstances( LMI_ChassisRef_Set_Tag(&lmi_chassis, dmi_get_chassis_tag(&dmi_chassis)); LMI_ChassisComputerSystemPackage_SetObjectPath_Dependent( - &lmi_chassis_cs_pkg, o); + &lmi_chassis_cs_pkg, lmi_get_computer_system()); LMI_ChassisComputerSystemPackage_Set_Antecedent(&lmi_chassis_cs_pkg, &lmi_chassis); LMI_ChassisComputerSystemPackage_Set_PlatformGUID(&lmi_chassis_cs_pkg, "0"); @@ -248,13 +238,13 @@ CMInstanceMIStub( LMI_ChassisComputerSystemPackage, LMI_ChassisComputerSystemPackage, _cb, - LMI_ChassisComputerSystemPackageInitialize()) + LMI_ChassisComputerSystemPackageInitialize(ctx)) CMAssociationMIStub( LMI_ChassisComputerSystemPackage, LMI_ChassisComputerSystemPackage, _cb, - LMI_ChassisComputerSystemPackageInitialize()) + LMI_ChassisComputerSystemPackageInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ChassisProvider.c b/src/hardware/LMI_ChassisProvider.c index 5ab2a39..664bdc6 100644 --- a/src/hardware/LMI_ChassisProvider.c +++ b/src/hardware/LMI_ChassisProvider.c @@ -28,9 +28,9 @@ CMPIUint16 get_chassis_type(const char *dmi_chassis); static const CMPIBroker* _cb = NULL; -static void LMI_ChassisInitialize() +static void LMI_ChassisInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ChassisCleanup( @@ -171,7 +171,7 @@ CMInstanceMIStub( LMI_Chassis, LMI_Chassis, _cb, - LMI_ChassisInitialize()) + LMI_ChassisInitialize(ctx)) static CMPIStatus LMI_ChassisMethodCleanup( CMPIMethodMI* mi, @@ -198,7 +198,7 @@ CMMethodMIStub( LMI_Chassis, LMI_Chassis, _cb, - LMI_ChassisInitialize()) + LMI_ChassisInitialize(ctx)) KUint32 LMI_Chassis_IsCompatible( const CMPIBroker* cb, diff --git a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c index 50ea529..c30bd5d 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_MemoryPhysicalPackageInConnectorInitialize() +static void LMI_MemoryPhysicalPackageInConnectorInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemoryPhysicalPackageInConnectorCleanup( @@ -257,13 +257,13 @@ CMInstanceMIStub( LMI_MemoryPhysicalPackageInConnector, LMI_MemoryPhysicalPackageInConnector, _cb, - LMI_MemoryPhysicalPackageInConnectorInitialize()) + LMI_MemoryPhysicalPackageInConnectorInitialize(ctx)) CMAssociationMIStub( LMI_MemoryPhysicalPackageInConnector, LMI_MemoryPhysicalPackageInConnector, _cb, - LMI_MemoryPhysicalPackageInConnectorInitialize()) + LMI_MemoryPhysicalPackageInConnectorInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_MemoryPhysicalPackageProvider.c b/src/hardware/LMI_MemoryPhysicalPackageProvider.c index f86557d..3e28495 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_MemoryPhysicalPackageInitialize() +static void LMI_MemoryPhysicalPackageInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemoryPhysicalPackageCleanup( @@ -162,7 +162,7 @@ CMInstanceMIStub( LMI_MemoryPhysicalPackage, LMI_MemoryPhysicalPackage, _cb, - LMI_MemoryPhysicalPackageInitialize()) + LMI_MemoryPhysicalPackageInitialize(ctx)) static CMPIStatus LMI_MemoryPhysicalPackageMethodCleanup( CMPIMethodMI* mi, @@ -189,7 +189,7 @@ CMMethodMIStub( LMI_MemoryPhysicalPackage, LMI_MemoryPhysicalPackage, _cb, - LMI_MemoryPhysicalPackageInitialize()) + LMI_MemoryPhysicalPackageInitialize(ctx)) KUint32 LMI_MemoryPhysicalPackage_IsCompatible( const CMPIBroker* cb, diff --git a/src/hardware/LMI_MemoryProvider.c b/src/hardware/LMI_MemoryProvider.c index f5f9ae8..43cba24 100644 --- a/src/hardware/LMI_MemoryProvider.c +++ b/src/hardware/LMI_MemoryProvider.c @@ -31,9 +31,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_MemoryInitialize() +static void LMI_MemoryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemoryCleanup( @@ -201,7 +201,7 @@ CMInstanceMIStub( LMI_Memory, LMI_Memory, _cb, - LMI_MemoryInitialize()) + LMI_MemoryInitialize(ctx)) static CMPIStatus LMI_MemoryMethodCleanup( CMPIMethodMI* mi, @@ -228,7 +228,7 @@ CMMethodMIStub( LMI_Memory, LMI_Memory, _cb, - LMI_MemoryInitialize()) + LMI_MemoryInitialize(ctx)) KUint32 LMI_Memory_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_MemorySlotContainerProvider.c b/src/hardware/LMI_MemorySlotContainerProvider.c index 6cc83b4..a87e676 100644 --- a/src/hardware/LMI_MemorySlotContainerProvider.c +++ b/src/hardware/LMI_MemorySlotContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_MemorySlotContainerInitialize() +static void LMI_MemorySlotContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemorySlotContainerCleanup( @@ -258,13 +258,13 @@ CMInstanceMIStub( LMI_MemorySlotContainer, LMI_MemorySlotContainer, _cb, - LMI_MemorySlotContainerInitialize()) + LMI_MemorySlotContainerInitialize(ctx)) CMAssociationMIStub( LMI_MemorySlotContainer, LMI_MemorySlotContainer, _cb, - LMI_MemorySlotContainerInitialize()) + LMI_MemorySlotContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_MemorySlotProvider.c b/src/hardware/LMI_MemorySlotProvider.c index 9c72d15..9d2c6d2 100644 --- a/src/hardware/LMI_MemorySlotProvider.c +++ b/src/hardware/LMI_MemorySlotProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_MemorySlotInitialize() +static void LMI_MemorySlotInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemorySlotCleanup( @@ -156,7 +156,7 @@ CMInstanceMIStub( LMI_MemorySlot, LMI_MemorySlot, _cb, - LMI_MemorySlotInitialize()) + LMI_MemorySlotInitialize(ctx)) static CMPIStatus LMI_MemorySlotMethodCleanup( CMPIMethodMI* mi, @@ -183,7 +183,7 @@ CMMethodMIStub( LMI_MemorySlot, LMI_MemorySlot, _cb, - LMI_MemorySlotInitialize()) + LMI_MemorySlotInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_MemorySystemDeviceProvider.c b/src/hardware/LMI_MemorySystemDeviceProvider.c index 9b25535..a9d5522 100644 --- a/src/hardware/LMI_MemorySystemDeviceProvider.c +++ b/src/hardware/LMI_MemorySystemDeviceProvider.c @@ -25,9 +25,9 @@ static const CMPIBroker* _cb; -static void LMI_MemorySystemDeviceInitialize() +static void LMI_MemorySystemDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemorySystemDeviceCleanup( @@ -56,19 +56,9 @@ static CMPIStatus LMI_MemorySystemDeviceEnumInstances( const char** properties) { LMI_MemorySystemDevice lmi_mem_sys_device; - CIM_ComputerSystemRef cim_cs; LMI_MemoryRef lmi_mem; - CMPIObjectPath *o; - CMPIStatus st; const char *ns = KNameSpace(cop); - CIM_ComputerSystemRef_Init(&cim_cs, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_cs, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_cs, - get_system_creation_class_name()); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_cs, &st); - CMSetClassName(o, get_system_creation_class_name()); - LMI_MemorySystemDevice_Init(&lmi_mem_sys_device, _cb, ns); LMI_MemoryRef_Init(&lmi_mem, _cb, ns); @@ -79,7 +69,7 @@ static CMPIStatus LMI_MemorySystemDeviceEnumInstances( LMI_MemoryRef_Set_DeviceID(&lmi_mem, "0"); LMI_MemorySystemDevice_SetObjectPath_GroupComponent( - &lmi_mem_sys_device, o); + &lmi_mem_sys_device, lmi_get_computer_system()); LMI_MemorySystemDevice_Set_PartComponent(&lmi_mem_sys_device, &lmi_mem); @@ -240,13 +230,13 @@ CMInstanceMIStub( LMI_MemorySystemDevice, LMI_MemorySystemDevice, _cb, - LMI_MemorySystemDeviceInitialize()) + LMI_MemorySystemDeviceInitialize(ctx)) CMAssociationMIStub( LMI_MemorySystemDevice, LMI_MemorySystemDevice, _cb, - LMI_MemorySystemDeviceInitialize()) + LMI_MemorySystemDeviceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PCIBridgeProvider.c b/src/hardware/LMI_PCIBridgeProvider.c index e712626..bca0a03 100644 --- a/src/hardware/LMI_PCIBridgeProvider.c +++ b/src/hardware/LMI_PCIBridgeProvider.c @@ -30,9 +30,9 @@ static const CMPIBroker* _cb = NULL; struct pci_access *acc_bridge = NULL; -static void LMI_PCIBridgeInitialize() +static void LMI_PCIBridgeInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); if (init_pci_access(&acc_bridge, PCI_FILL_IDENT | PCI_FILL_IRQ @@ -423,7 +423,7 @@ CMInstanceMIStub( LMI_PCIBridge, LMI_PCIBridge, _cb, - LMI_PCIBridgeInitialize()) + LMI_PCIBridgeInitialize(ctx)) static CMPIStatus LMI_PCIBridgeMethodCleanup( CMPIMethodMI* mi, @@ -450,7 +450,7 @@ CMMethodMIStub( LMI_PCIBridge, LMI_PCIBridge, _cb, - LMI_PCIBridgeInitialize()) + LMI_PCIBridgeInitialize(ctx)) KUint32 LMI_PCIBridge_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c index 2532c38..5dfb304 100644 --- a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c @@ -28,9 +28,9 @@ static const CMPIBroker* _cb; struct pci_access *acc_system_bridge = NULL; -static void LMI_PCIBridgeSystemDeviceInitialize() +static void LMI_PCIBridgeSystemDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); if (init_pci_access(&acc_system_bridge, PCI_FILL_CLASS) != 0) { error("Failed to access the PCI bus."); @@ -66,21 +66,11 @@ static CMPIStatus LMI_PCIBridgeSystemDeviceEnumInstances( const char** properties) { LMI_PCIBridgeSystemDevice lmi_pci_sys_device; - CIM_ComputerSystemRef cim_cs; LMI_PCIBridgeRef lmi_dev; - CMPIObjectPath *o; - CMPIStatus st; const char *ns = KNameSpace(cop); struct pci_dev *dev; char device_id_str[PCI_DEVID_STR_SIZE]; - CIM_ComputerSystemRef_Init(&cim_cs, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_cs, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_cs, - get_system_creation_class_name()); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_cs, &st); - CMSetClassName(o, get_system_creation_class_name()); - for (dev = acc_system_bridge->devices; dev; dev = dev->next) { /* Use only PCI Bridges */ /* Throw away the lower 8 bits denoting the subclass */ @@ -102,7 +92,7 @@ static CMPIStatus LMI_PCIBridgeSystemDeviceEnumInstances( LMI_PCIBridgeRef_Set_DeviceID(&lmi_dev, device_id_str); LMI_PCIBridgeSystemDevice_SetObjectPath_GroupComponent( - &lmi_pci_sys_device, o); + &lmi_pci_sys_device, lmi_get_computer_system()); LMI_PCIBridgeSystemDevice_Set_PartComponent(&lmi_pci_sys_device, &lmi_dev); @@ -264,13 +254,13 @@ CMInstanceMIStub( LMI_PCIBridgeSystemDevice, LMI_PCIBridgeSystemDevice, _cb, - LMI_PCIBridgeSystemDeviceInitialize()) + LMI_PCIBridgeSystemDeviceInitialize(ctx)) CMAssociationMIStub( LMI_PCIBridgeSystemDevice, LMI_PCIBridgeSystemDevice, _cb, - LMI_PCIBridgeSystemDeviceInitialize()) + LMI_PCIBridgeSystemDeviceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PCIDeviceProvider.c b/src/hardware/LMI_PCIDeviceProvider.c index 1a9eeca..c5f88d5 100644 --- a/src/hardware/LMI_PCIDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceProvider.c @@ -29,9 +29,9 @@ static const CMPIBroker* _cb = NULL; struct pci_access *acc_dev = NULL; -static void LMI_PCIDeviceInitialize() +static void LMI_PCIDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); if (init_pci_access(&acc_dev, PCI_FILL_IDENT | PCI_FILL_IRQ @@ -324,7 +324,7 @@ CMInstanceMIStub( LMI_PCIDevice, LMI_PCIDevice, _cb, - LMI_PCIDeviceInitialize()) + LMI_PCIDeviceInitialize(ctx)) static CMPIStatus LMI_PCIDeviceMethodCleanup( CMPIMethodMI* mi, @@ -351,7 +351,7 @@ CMMethodMIStub( LMI_PCIDevice, LMI_PCIDevice, _cb, - LMI_PCIDeviceInitialize()) + LMI_PCIDeviceInitialize(ctx)) KUint32 LMI_PCIDevice_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c index cf8634c..1f5372f 100644 --- a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c @@ -28,9 +28,9 @@ static const CMPIBroker* _cb; struct pci_access *acc_system_dev = NULL; -static void LMI_PCIDeviceSystemDeviceInitialize() +static void LMI_PCIDeviceSystemDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); if (init_pci_access(&acc_system_dev, PCI_FILL_CLASS) != 0) { error("Failed to access the PCI bus."); @@ -66,21 +66,11 @@ static CMPIStatus LMI_PCIDeviceSystemDeviceEnumInstances( const char** properties) { LMI_PCIDeviceSystemDevice lmi_pci_sys_device; - CIM_ComputerSystemRef cim_cs; LMI_PCIDeviceRef lmi_dev; - CMPIObjectPath *o; - CMPIStatus st; const char *ns = KNameSpace(cop); struct pci_dev *dev; char device_id_str[PCI_DEVID_STR_SIZE]; - CIM_ComputerSystemRef_Init(&cim_cs, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_cs, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_cs, - get_system_creation_class_name()); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_cs, &st); - CMSetClassName(o, get_system_creation_class_name()); - for (dev = acc_system_dev->devices; dev; dev = dev->next) { /* Ignore PCI Bridges */ /* Throw away the lower 8 bits denoting the subclass */ @@ -102,7 +92,7 @@ static CMPIStatus LMI_PCIDeviceSystemDeviceEnumInstances( LMI_PCIDeviceRef_Set_DeviceID(&lmi_dev, device_id_str); LMI_PCIDeviceSystemDevice_SetObjectPath_GroupComponent( - &lmi_pci_sys_device, o); + &lmi_pci_sys_device, lmi_get_computer_system()); LMI_PCIDeviceSystemDevice_Set_PartComponent(&lmi_pci_sys_device, &lmi_dev); @@ -264,13 +254,13 @@ CMInstanceMIStub( LMI_PCIDeviceSystemDevice, LMI_PCIDeviceSystemDevice, _cb, - LMI_PCIDeviceSystemDeviceInitialize()) + LMI_PCIDeviceSystemDeviceInitialize(ctx)) CMAssociationMIStub( LMI_PCIDeviceSystemDevice, LMI_PCIDeviceSystemDevice, _cb, - LMI_PCIDeviceSystemDeviceInitialize()) + LMI_PCIDeviceSystemDeviceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PhysicalBatteryContainerProvider.c b/src/hardware/LMI_PhysicalBatteryContainerProvider.c index 67acbb7..0af077d 100644 --- a/src/hardware/LMI_PhysicalBatteryContainerProvider.c +++ b/src/hardware/LMI_PhysicalBatteryContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_PhysicalBatteryContainerInitialize() +static void LMI_PhysicalBatteryContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PhysicalBatteryContainerCleanup( @@ -254,13 +254,13 @@ CMInstanceMIStub( LMI_PhysicalBatteryContainer, LMI_PhysicalBatteryContainer, _cb, - LMI_PhysicalBatteryContainerInitialize()) + LMI_PhysicalBatteryContainerInitialize(ctx)) CMAssociationMIStub( LMI_PhysicalBatteryContainer, LMI_PhysicalBatteryContainer, _cb, - LMI_PhysicalBatteryContainerInitialize()) + LMI_PhysicalBatteryContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c index 66ab5f7..297a5e4 100644 --- a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_PhysicalBatteryRealizesInitialize() +static void LMI_PhysicalBatteryRealizesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PhysicalBatteryRealizesCleanup( @@ -250,13 +250,13 @@ CMInstanceMIStub( LMI_PhysicalBatteryRealizes, LMI_PhysicalBatteryRealizes, _cb, - LMI_PhysicalBatteryRealizesInitialize()) + LMI_PhysicalBatteryRealizesInitialize(ctx)) CMAssociationMIStub( LMI_PhysicalBatteryRealizes, LMI_PhysicalBatteryRealizes, _cb, - LMI_PhysicalBatteryRealizesInitialize()) + LMI_PhysicalBatteryRealizesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PhysicalMemoryContainerProvider.c b/src/hardware/LMI_PhysicalMemoryContainerProvider.c index 57cd994..69e8722 100644 --- a/src/hardware/LMI_PhysicalMemoryContainerProvider.c +++ b/src/hardware/LMI_PhysicalMemoryContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_PhysicalMemoryContainerInitialize() +static void LMI_PhysicalMemoryContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryContainerCleanup( @@ -248,13 +248,13 @@ CMInstanceMIStub( LMI_PhysicalMemoryContainer, LMI_PhysicalMemoryContainer, _cb, - LMI_PhysicalMemoryContainerInitialize()) + LMI_PhysicalMemoryContainerInitialize(ctx)) CMAssociationMIStub( LMI_PhysicalMemoryContainer, LMI_PhysicalMemoryContainer, _cb, - LMI_PhysicalMemoryContainerInitialize()) + LMI_PhysicalMemoryContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PhysicalMemoryProvider.c b/src/hardware/LMI_PhysicalMemoryProvider.c index 53d5256..d9af505 100644 --- a/src/hardware/LMI_PhysicalMemoryProvider.c +++ b/src/hardware/LMI_PhysicalMemoryProvider.c @@ -29,9 +29,9 @@ CMPIUint16 get_memory_type(const char *dmi_type); static const CMPIBroker* _cb = NULL; -static void LMI_PhysicalMemoryInitialize() +static void LMI_PhysicalMemoryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryCleanup( @@ -176,7 +176,7 @@ CMInstanceMIStub( LMI_PhysicalMemory, LMI_PhysicalMemory, _cb, - LMI_PhysicalMemoryInitialize()) + LMI_PhysicalMemoryInitialize(ctx)) static CMPIStatus LMI_PhysicalMemoryMethodCleanup( CMPIMethodMI* mi, @@ -319,7 +319,7 @@ CMMethodMIStub( LMI_PhysicalMemory, LMI_PhysicalMemory, _cb, - LMI_PhysicalMemoryInitialize()) + LMI_PhysicalMemoryInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c index c50e517..aad120f 100644 --- a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_PhysicalMemoryRealizesInitialize() +static void LMI_PhysicalMemoryRealizesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryRealizesCleanup( @@ -249,13 +249,13 @@ CMInstanceMIStub( LMI_PhysicalMemoryRealizes, LMI_PhysicalMemoryRealizes, _cb, - LMI_PhysicalMemoryRealizesInitialize()) + LMI_PhysicalMemoryRealizesInitialize(ctx)) CMAssociationMIStub( LMI_PhysicalMemoryRealizes, LMI_PhysicalMemoryRealizes, _cb, - LMI_PhysicalMemoryRealizesInitialize()) + LMI_PhysicalMemoryRealizesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PointingDeviceProvider.c b/src/hardware/LMI_PointingDeviceProvider.c index 5fbecb8..7a899fd 100644 --- a/src/hardware/LMI_PointingDeviceProvider.c +++ b/src/hardware/LMI_PointingDeviceProvider.c @@ -28,9 +28,9 @@ CMPIUint16 get_pointingtype(const char *dmi_val); static const CMPIBroker* _cb = NULL; -static void LMI_PointingDeviceInitialize() +static void LMI_PointingDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PointingDeviceCleanup( @@ -158,7 +158,7 @@ CMInstanceMIStub( LMI_PointingDevice, LMI_PointingDevice, _cb, - LMI_PointingDeviceInitialize()) + LMI_PointingDeviceInitialize(ctx)) static CMPIStatus LMI_PointingDeviceMethodCleanup( CMPIMethodMI* mi, @@ -185,7 +185,7 @@ CMMethodMIStub( LMI_PointingDevice, LMI_PointingDevice, _cb, - LMI_PointingDeviceInitialize()) + LMI_PointingDeviceInitialize(ctx)) KUint32 LMI_PointingDevice_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c index 5b53af3..9780a12 100644 --- a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_PortPhysicalConnectorContainerInitialize() +static void LMI_PortPhysicalConnectorContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PortPhysicalConnectorContainerCleanup( @@ -252,13 +252,13 @@ CMInstanceMIStub( LMI_PortPhysicalConnectorContainer, LMI_PortPhysicalConnectorContainer, _cb, - LMI_PortPhysicalConnectorContainerInitialize()) + LMI_PortPhysicalConnectorContainerInitialize(ctx)) CMAssociationMIStub( LMI_PortPhysicalConnectorContainer, LMI_PortPhysicalConnectorContainer, _cb, - LMI_PortPhysicalConnectorContainerInitialize()) + LMI_PortPhysicalConnectorContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_PortPhysicalConnectorProvider.c b/src/hardware/LMI_PortPhysicalConnectorProvider.c index 75f6738..5add71e 100644 --- a/src/hardware/LMI_PortPhysicalConnectorProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorProvider.c @@ -28,9 +28,9 @@ CMPIUint16 get_connectorlayout(const char *dmi_val); static const CMPIBroker* _cb = NULL; -static void LMI_PortPhysicalConnectorInitialize() +static void LMI_PortPhysicalConnectorInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_PortPhysicalConnectorCleanup( @@ -176,7 +176,7 @@ CMInstanceMIStub( LMI_PortPhysicalConnector, LMI_PortPhysicalConnector, _cb, - LMI_PortPhysicalConnectorInitialize()) + LMI_PortPhysicalConnectorInitialize(ctx)) static CMPIStatus LMI_PortPhysicalConnectorMethodCleanup( CMPIMethodMI* mi, @@ -262,7 +262,7 @@ CMMethodMIStub( LMI_PortPhysicalConnector, LMI_PortPhysicalConnector, _cb, - LMI_PortPhysicalConnectorInitialize()) + LMI_PortPhysicalConnectorInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ProcessorCacheMemoryProvider.c b/src/hardware/LMI_ProcessorCacheMemoryProvider.c index 65c3867..616faa7 100644 --- a/src/hardware/LMI_ProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_ProcessorCacheMemoryProvider.c @@ -29,9 +29,9 @@ CMPIUint16 get_cachestatus(const char *status); static const CMPIBroker* _cb = NULL; -static void LMI_ProcessorCacheMemoryInitialize() +static void LMI_ProcessorCacheMemoryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorCacheMemoryCleanup( @@ -220,7 +220,7 @@ CMInstanceMIStub( LMI_ProcessorCacheMemory, LMI_ProcessorCacheMemory, _cb, - LMI_ProcessorCacheMemoryInitialize()) + LMI_ProcessorCacheMemoryInitialize(ctx)) static CMPIStatus LMI_ProcessorCacheMemoryMethodCleanup( CMPIMethodMI* mi, @@ -247,7 +247,7 @@ CMMethodMIStub( LMI_ProcessorCacheMemory, LMI_ProcessorCacheMemory, _cb, - LMI_ProcessorCacheMemoryInitialize()) + LMI_ProcessorCacheMemoryInitialize(ctx)) KUint32 LMI_ProcessorCacheMemory_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_ProcessorCapabilitiesProvider.c b/src/hardware/LMI_ProcessorCapabilitiesProvider.c index b3bf7b6..a3ed407 100644 --- a/src/hardware/LMI_ProcessorCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorCapabilitiesProvider.c @@ -27,9 +27,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_ProcessorCapabilitiesInitialize() +static void LMI_ProcessorCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorCapabilitiesCleanup( @@ -193,7 +193,7 @@ CMInstanceMIStub( LMI_ProcessorCapabilities, LMI_ProcessorCapabilities, _cb, - LMI_ProcessorCapabilitiesInitialize()) + LMI_ProcessorCapabilitiesInitialize(ctx)) static CMPIStatus LMI_ProcessorCapabilitiesMethodCleanup( CMPIMethodMI* mi, @@ -220,7 +220,7 @@ CMMethodMIStub( LMI_ProcessorCapabilities, LMI_ProcessorCapabilities, _cb, - LMI_ProcessorCapabilitiesInitialize()) + LMI_ProcessorCapabilitiesInitialize(ctx)) KUint16 LMI_ProcessorCapabilities_CreateGoalSettings( const CMPIBroker* cb, diff --git a/src/hardware/LMI_ProcessorChipContainerProvider.c b/src/hardware/LMI_ProcessorChipContainerProvider.c index 9662380..a8da142 100644 --- a/src/hardware/LMI_ProcessorChipContainerProvider.c +++ b/src/hardware/LMI_ProcessorChipContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_ProcessorChipContainerInitialize() +static void LMI_ProcessorChipContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipContainerCleanup( @@ -252,13 +252,13 @@ CMInstanceMIStub( LMI_ProcessorChipContainer, LMI_ProcessorChipContainer, _cb, - LMI_ProcessorChipContainerInitialize()) + LMI_ProcessorChipContainerInitialize(ctx)) CMAssociationMIStub( LMI_ProcessorChipContainer, LMI_ProcessorChipContainer, _cb, - LMI_ProcessorChipContainerInitialize()) + LMI_ProcessorChipContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ProcessorChipProvider.c b/src/hardware/LMI_ProcessorChipProvider.c index 9949de6..175f5d2 100644 --- a/src/hardware/LMI_ProcessorChipProvider.c +++ b/src/hardware/LMI_ProcessorChipProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_ProcessorChipInitialize() +static void LMI_ProcessorChipInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipCleanup( @@ -156,7 +156,7 @@ CMInstanceMIStub( LMI_ProcessorChip, LMI_ProcessorChip, _cb, - LMI_ProcessorChipInitialize()) + LMI_ProcessorChipInitialize(ctx)) static CMPIStatus LMI_ProcessorChipMethodCleanup( CMPIMethodMI* mi, @@ -183,7 +183,7 @@ CMMethodMIStub( LMI_ProcessorChip, LMI_ProcessorChip, _cb, - LMI_ProcessorChipInitialize()) + LMI_ProcessorChipInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ProcessorChipRealizesProvider.c b/src/hardware/LMI_ProcessorChipRealizesProvider.c index 6d85c7d..881cd26 100644 --- a/src/hardware/LMI_ProcessorChipRealizesProvider.c +++ b/src/hardware/LMI_ProcessorChipRealizesProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_ProcessorChipRealizesInitialize() +static void LMI_ProcessorChipRealizesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipRealizesCleanup( @@ -250,13 +250,13 @@ CMInstanceMIStub( LMI_ProcessorChipRealizes, LMI_ProcessorChipRealizes, _cb, - LMI_ProcessorChipRealizesInitialize()) + LMI_ProcessorChipRealizesInitialize(ctx)) CMAssociationMIStub( LMI_ProcessorChipRealizes, LMI_ProcessorChipRealizes, _cb, - LMI_ProcessorChipRealizesInitialize()) + LMI_ProcessorChipRealizesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c index 2f25e62..fcb5128 100644 --- a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c @@ -29,9 +29,9 @@ static const CMPIBroker* _cb; -static void LMI_ProcessorElementCapabilitiesInitialize() +static void LMI_ProcessorElementCapabilitiesInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorElementCapabilitiesCleanup( @@ -295,13 +295,13 @@ CMInstanceMIStub( LMI_ProcessorElementCapabilities, LMI_ProcessorElementCapabilities, _cb, - LMI_ProcessorElementCapabilitiesInitialize()) + LMI_ProcessorElementCapabilitiesInitialize(ctx)) CMAssociationMIStub( LMI_ProcessorElementCapabilities, LMI_ProcessorElementCapabilities, _cb, - LMI_ProcessorElementCapabilitiesInitialize()) + LMI_ProcessorElementCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_ProcessorProvider.c b/src/hardware/LMI_ProcessorProvider.c index 903e112..04e1d80 100644 --- a/src/hardware/LMI_ProcessorProvider.c +++ b/src/hardware/LMI_ProcessorProvider.c @@ -48,9 +48,9 @@ CMPIUint16 get_flag(const char *flag, short *stat); static const CMPIBroker* _cb = NULL; -static void LMI_ProcessorInitialize() +static void LMI_ProcessorInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorCleanup( @@ -314,7 +314,7 @@ CMInstanceMIStub( LMI_Processor, LMI_Processor, _cb, - LMI_ProcessorInitialize()) + LMI_ProcessorInitialize(ctx)) static CMPIStatus LMI_ProcessorMethodCleanup( CMPIMethodMI* mi, @@ -341,7 +341,7 @@ CMMethodMIStub( LMI_Processor, LMI_Processor, _cb, - LMI_ProcessorInitialize()) + LMI_ProcessorInitialize(ctx)) KUint32 LMI_Processor_RequestStateChange( const CMPIBroker* cb, diff --git a/src/hardware/LMI_ProcessorSystemDeviceProvider.c b/src/hardware/LMI_ProcessorSystemDeviceProvider.c index 2b5112a..21a2ec4 100644 --- a/src/hardware/LMI_ProcessorSystemDeviceProvider.c +++ b/src/hardware/LMI_ProcessorSystemDeviceProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_ProcessorSystemDeviceInitialize() +static void LMI_ProcessorSystemDeviceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ProcessorSystemDeviceCleanup( @@ -57,10 +57,7 @@ static CMPIStatus LMI_ProcessorSystemDeviceEnumInstances( const char** properties) { LMI_ProcessorSystemDevice lmi_cpu_sys_device; - CIM_ComputerSystemRef cim_cs; LMI_ProcessorRef lmi_cpu; - CMPIObjectPath *o; - CMPIStatus st; const char *ns = KNameSpace(cop); unsigned i; DmiProcessor *dmi_cpus = NULL; @@ -70,13 +67,6 @@ static CMPIStatus LMI_ProcessorSystemDeviceEnumInstances( goto done; } - CIM_ComputerSystemRef_Init(&cim_cs, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_cs, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_cs, - get_system_creation_class_name()); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_cs, &st); - CMSetClassName(o, get_system_creation_class_name()); - for (i = 0; i < dmi_cpus_nb; i++) { LMI_ProcessorSystemDevice_Init(&lmi_cpu_sys_device, _cb, ns); @@ -89,7 +79,7 @@ static CMPIStatus LMI_ProcessorSystemDeviceEnumInstances( LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); LMI_ProcessorSystemDevice_SetObjectPath_GroupComponent( - &lmi_cpu_sys_device, o); + &lmi_cpu_sys_device, lmi_get_computer_system()); LMI_ProcessorSystemDevice_Set_PartComponent(&lmi_cpu_sys_device, &lmi_cpu); @@ -254,13 +244,13 @@ CMInstanceMIStub( LMI_ProcessorSystemDevice, LMI_ProcessorSystemDevice, _cb, - LMI_ProcessorSystemDeviceInitialize()) + LMI_ProcessorSystemDeviceInitialize(ctx)) CMAssociationMIStub( LMI_ProcessorSystemDevice, LMI_ProcessorSystemDevice, _cb, - LMI_ProcessorSystemDeviceInitialize()) + LMI_ProcessorSystemDeviceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_SystemSlotContainerProvider.c b/src/hardware/LMI_SystemSlotContainerProvider.c index af39495..ab91e0f 100644 --- a/src/hardware/LMI_SystemSlotContainerProvider.c +++ b/src/hardware/LMI_SystemSlotContainerProvider.c @@ -26,9 +26,9 @@ static const CMPIBroker* _cb; -static void LMI_SystemSlotContainerInitialize() +static void LMI_SystemSlotContainerInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SystemSlotContainerCleanup( @@ -252,13 +252,13 @@ CMInstanceMIStub( LMI_SystemSlotContainer, LMI_SystemSlotContainer, _cb, - LMI_SystemSlotContainerInitialize()) + LMI_SystemSlotContainerInitialize(ctx)) CMAssociationMIStub( LMI_SystemSlotContainer, LMI_SystemSlotContainer, _cb, - LMI_SystemSlotContainerInitialize()) + LMI_SystemSlotContainerInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/hardware/LMI_SystemSlotProvider.c b/src/hardware/LMI_SystemSlotProvider.c index 0de8344..82bd312 100644 --- a/src/hardware/LMI_SystemSlotProvider.c +++ b/src/hardware/LMI_SystemSlotProvider.c @@ -29,9 +29,9 @@ CMPIUint16 get_maxlinkwidth(const char *dmi_val); static const CMPIBroker* _cb = NULL; -static void LMI_SystemSlotInitialize() +static void LMI_SystemSlotInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SystemSlotCleanup( @@ -180,7 +180,7 @@ CMInstanceMIStub( LMI_SystemSlot, LMI_SystemSlot, _cb, - LMI_SystemSlotInitialize()) + LMI_SystemSlotInitialize(ctx)) static CMPIStatus LMI_SystemSlotMethodCleanup( CMPIMethodMI* mi, @@ -317,7 +317,7 @@ CMMethodMIStub( LMI_SystemSlot, LMI_SystemSlot, _cb, - LMI_SystemSlotInitialize()) + LMI_SystemSlotInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/journald/LMI_JournalLogRecordInstanceCreationIndicationProvider.c b/src/journald/LMI_JournalLogRecordInstanceCreationIndicationProvider.c index 83daf63..19dceda 100644 --- a/src/journald/LMI_JournalLogRecordInstanceCreationIndicationProvider.c +++ b/src/journald/LMI_JournalLogRecordInstanceCreationIndicationProvider.c @@ -31,9 +31,9 @@ static const CMPIBroker* _cb = NULL; static IMManager *im = NULL; static IMError im_err = IM_ERR_OK; -static void LMI_JournalLogRecordInstanceCreationIndicationInitialize() +static void LMI_JournalLogRecordInstanceCreationIndicationInitialize(const CMPIContext *ctx) { - lmi_init(JOURNAL_CIM_LOG_NAME, _cb, provider_config_defaults); + lmi_init(JOURNAL_CIM_LOG_NAME, _cb, ctx, provider_config_defaults); im = im_create_manager(ind_gather, ind_filter_cb, false, ind_watcher, IM_IND_CREATION, _cb, &im_err); } @@ -125,7 +125,7 @@ CMIndicationMIStub( LMI_JournalLogRecordInstanceCreationIndication, LMI_JournalLogRecordInstanceCreationIndication, _cb, - LMI_JournalLogRecordInstanceCreationIndicationInitialize()) + LMI_JournalLogRecordInstanceCreationIndicationInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/journald/LMI_JournalLogRecordProvider.c b/src/journald/LMI_JournalLogRecordProvider.c index 7fb5e4b..b21a562 100644 --- a/src/journald/LMI_JournalLogRecordProvider.c +++ b/src/journald/LMI_JournalLogRecordProvider.c @@ -38,12 +38,12 @@ static const CMPIBroker* _cb = NULL; static sd_journal *journal_iter = NULL; -static void LMI_JournalLogRecordInitialize() +static void LMI_JournalLogRecordInitialize(const CMPIContext *ctx) { sd_journal *journal; int r; - lmi_init(JOURNAL_CIM_LOG_NAME, _cb, provider_config_defaults); + lmi_init(JOURNAL_CIM_LOG_NAME, _cb, ctx, provider_config_defaults); r = sd_journal_open(&journal, 0); if (r < 0) { @@ -315,7 +315,7 @@ CMInstanceMIStub( LMI_JournalLogRecord, LMI_JournalLogRecord, _cb, - LMI_JournalLogRecordInitialize()) + LMI_JournalLogRecordInitialize(ctx)) static CMPIStatus LMI_JournalLogRecordMethodCleanup( CMPIMethodMI* mi, @@ -342,7 +342,7 @@ CMMethodMIStub( LMI_JournalLogRecord, LMI_JournalLogRecord, _cb, - LMI_JournalLogRecordInitialize()) + LMI_JournalLogRecordInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/journald/LMI_JournalMessageLogProvider.c b/src/journald/LMI_JournalMessageLogProvider.c index 94ae200..7b3dff3 100644 --- a/src/journald/LMI_JournalMessageLogProvider.c +++ b/src/journald/LMI_JournalMessageLogProvider.c @@ -36,9 +36,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_JournalMessageLogInitialize() +static void LMI_JournalMessageLogInitialize(const CMPIContext *ctx) { - lmi_init(JOURNAL_CIM_LOG_NAME, _cb, provider_config_defaults); + lmi_init(JOURNAL_CIM_LOG_NAME, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_JournalMessageLogCleanup( @@ -156,7 +156,7 @@ CMInstanceMIStub( LMI_JournalMessageLog, LMI_JournalMessageLog, _cb, - LMI_JournalMessageLogInitialize()) + LMI_JournalMessageLogInitialize(ctx)) static CMPIStatus LMI_JournalMessageLogMethodCleanup( CMPIMethodMI* mi, @@ -183,7 +183,7 @@ CMMethodMIStub( LMI_JournalMessageLog, LMI_JournalMessageLog, _cb, - LMI_JournalMessageLogInitialize()) + LMI_JournalMessageLogInitialize(ctx)) KUint32 LMI_JournalMessageLog_RequestStateChange( const CMPIBroker* cb, diff --git a/src/journald/LMI_JournalRecordInLogProvider.c b/src/journald/LMI_JournalRecordInLogProvider.c index c22116f..9be0f19 100644 --- a/src/journald/LMI_JournalRecordInLogProvider.c +++ b/src/journald/LMI_JournalRecordInLogProvider.c @@ -29,9 +29,9 @@ static const CMPIBroker* _cb; -static void LMI_JournalRecordInLogInitialize() +static void LMI_JournalRecordInLogInitialize(const CMPIContext *ctx) { - lmi_init(JOURNAL_CIM_LOG_NAME, _cb, provider_config_defaults); + lmi_init(JOURNAL_CIM_LOG_NAME, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_JournalRecordInLogCleanup( @@ -259,13 +259,13 @@ CMInstanceMIStub( LMI_JournalRecordInLog, LMI_JournalRecordInLog, _cb, - LMI_JournalRecordInLogInitialize()) + LMI_JournalRecordInLogInitialize(ctx)) CMAssociationMIStub( LMI_JournalRecordInLog, LMI_JournalRecordInLog, _cb, - LMI_JournalRecordInLogInitialize()) + LMI_JournalRecordInLogInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_DataFileProvider.c b/src/logicalfile/LMI_DataFileProvider.c index fb34b47..096991b 100644 --- a/src/logicalfile/LMI_DataFileProvider.c +++ b/src/logicalfile/LMI_DataFileProvider.c @@ -23,9 +23,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_DataFileInitialize() +static void LMI_DataFileInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_DataFileCleanup( @@ -65,7 +65,7 @@ static CMPIStatus LMI_DataFileGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_DataFile_InitFromObjectPath(&logicalfile.lf.datafile, _cb, cop); @@ -121,7 +121,7 @@ CMInstanceMIStub( LMI_DataFile, LMI_DataFile, _cb, - LMI_DataFileInitialize()) + LMI_DataFileInitialize(ctx)) static CMPIStatus LMI_DataFileMethodCleanup( CMPIMethodMI* mi, @@ -148,7 +148,7 @@ CMMethodMIStub( LMI_DataFile, LMI_DataFile, _cb, - LMI_DataFileInitialize()) + LMI_DataFileInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_DirectoryContainsFileProvider.c b/src/logicalfile/LMI_DirectoryContainsFileProvider.c index 6eb74c6..4cf37dc 100644 --- a/src/logicalfile/LMI_DirectoryContainsFileProvider.c +++ b/src/logicalfile/LMI_DirectoryContainsFileProvider.c @@ -140,7 +140,7 @@ static CMPIStatus associators( int group = -1; int rgroup = -1; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); if (st.rc != CMPI_RC_OK) { return st; } @@ -265,7 +265,7 @@ static CMPIStatus references( group = 0; } } - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); CIM_DirectoryRef_Init(&lmi_dr, _cb, ns); @@ -343,9 +343,9 @@ static CMPIStatus references( CMReturn(CMPI_RC_OK); } -static void LMI_DirectoryContainsFileInitialize() +static void LMI_DirectoryContainsFileInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_DirectoryContainsFileCleanup( @@ -492,13 +492,13 @@ CMInstanceMIStub( LMI_DirectoryContainsFile, LMI_DirectoryContainsFile, _cb, - LMI_DirectoryContainsFileInitialize()) + LMI_DirectoryContainsFileInitialize(ctx)) CMAssociationMIStub( LMI_DirectoryContainsFile, LMI_DirectoryContainsFile, _cb, - LMI_DirectoryContainsFileInitialize()) + LMI_DirectoryContainsFileInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_FIFOPipeFileProvider.c b/src/logicalfile/LMI_FIFOPipeFileProvider.c index 8277e49..c1f40a7 100644 --- a/src/logicalfile/LMI_FIFOPipeFileProvider.c +++ b/src/logicalfile/LMI_FIFOPipeFileProvider.c @@ -23,9 +23,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_FIFOPipeFileInitialize() +static void LMI_FIFOPipeFileInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_FIFOPipeFileCleanup( @@ -65,7 +65,7 @@ static CMPIStatus LMI_FIFOPipeFileGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_FIFOPipeFile_InitFromObjectPath(&logicalfile.lf.fifopipefile, _cb, cop); @@ -123,7 +123,7 @@ CMInstanceMIStub( LMI_FIFOPipeFile, LMI_FIFOPipeFile, _cb, - LMI_FIFOPipeFileInitialize()) + LMI_FIFOPipeFileInitialize(ctx)) static CMPIStatus LMI_FIFOPipeFileMethodCleanup( CMPIMethodMI* mi, @@ -150,7 +150,7 @@ CMMethodMIStub( LMI_FIFOPipeFile, LMI_FIFOPipeFile, _cb, - LMI_FIFOPipeFileInitialize()) + LMI_FIFOPipeFileInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_FileIdentityProvider.c b/src/logicalfile/LMI_FileIdentityProvider.c index cf47d17..c143fdb 100644 --- a/src/logicalfile/LMI_FileIdentityProvider.c +++ b/src/logicalfile/LMI_FileIdentityProvider.c @@ -52,7 +52,7 @@ static CMPIStatus associators( if (CMClassPathIsA(_cb, cop, LMI_UnixFile_ClassName, &st)) { /* got UnixFile - SameElement */ - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); path = get_string_property_from_op(cop, "LFName"); @@ -76,7 +76,7 @@ static CMPIStatus associators( CMSetClassName(o, fileclass); } else { /* got LogicalFile - SystemElement */ - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); path = get_string_property_from_op(cop, "Name"); @@ -143,7 +143,7 @@ static CMPIStatus references( /* got UnixFile - SameElement */ LMI_FileIdentity_SetObjectPath_SameElement(&lmi_fi, cop); - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); if (st.rc != CMPI_RC_OK) { return st; } @@ -169,7 +169,7 @@ static CMPIStatus references( /* got LogicalFile - SystemElement */ LMI_FileIdentity_SetObjectPath_SystemElement(&lmi_fi, cop); - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); if (st.rc != CMPI_RC_OK) { return st; } @@ -206,9 +206,9 @@ static CMPIStatus references( return res; } -static void LMI_FileIdentityInitialize() +static void LMI_FileIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_FileIdentityCleanup( @@ -354,13 +354,13 @@ CMInstanceMIStub( LMI_FileIdentity, LMI_FileIdentity, _cb, - LMI_FileIdentityInitialize()) + LMI_FileIdentityInitialize(ctx)) CMAssociationMIStub( LMI_FileIdentity, LMI_FileIdentity, _cb, - LMI_FileIdentityInitialize()) + LMI_FileIdentityInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c index 7de3689..fc175bc 100644 --- a/src/logicalfile/LMI_RootDirectoryProvider.c +++ b/src/logicalfile/LMI_RootDirectoryProvider.c @@ -65,16 +65,10 @@ static CMPIStatus associators( CMReturn(CMPI_RC_OK); } - CIM_ComputerSystemRef cim_csr; - CIM_ComputerSystemRef_Init(&cim_csr, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_csr, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_csr, comp_ccname); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_csr, &st); - CMSetClassName(o, comp_ccname); if (names) { - CMReturnObjectPath(cr, o); + CMReturnObjectPath(cr, lmi_get_computer_system()); } else { - ci = _cb->bft->getInstance(_cb, cc, o, properties, &st); + ci = _cb->bft->getInstance(_cb, cc, lmi_get_computer_system(), properties, &st); CMReturnInstance(cr, ci); } } else { @@ -117,7 +111,6 @@ static CMPIStatus references( CMPIObjectPath *o; CMPIInstance *ci; CMPIStatus st; - const char *comp_ccname = get_system_creation_class_name(); const char *ns = KNameSpace(cop); const char *path = get_string_property_from_op(cop, "Name"); char ccname[BUFLEN]; @@ -141,17 +134,12 @@ static CMPIStatus references( if (strcmp(path, "/") != 0) { CMReturn(CMPI_RC_OK); } - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, cop); - CIM_ComputerSystemRef cim_csr; - CIM_ComputerSystemRef_Init(&cim_csr, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_csr, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_csr, comp_ccname); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_csr, &st); - CMSetClassName(o, comp_ccname); - LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, o); + LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, + lmi_get_computer_system()); } else { /* got CIM_ComputerSystem - GroupComponent */ if (role && strcmp(role, GROUP_COMPONENT) != 0) { @@ -177,9 +165,9 @@ static CMPIStatus references( CMReturn(CMPI_RC_OK); } -static void LMI_RootDirectoryInitialize() +static void LMI_RootDirectoryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_RootDirectoryCleanup( @@ -210,18 +198,11 @@ static CMPIStatus LMI_RootDirectoryEnumInstances( CMPIStatus st; char *fsname; const char *ns = KNameSpace(cop); - const char *ccname = lmi_get_system_creation_class_name(); LMI_RootDirectory lmi_rd; LMI_RootDirectory_Init(&lmi_rd, _cb, ns); - CIM_ComputerSystemRef cim_csr; - CIM_ComputerSystemRef_Init(&cim_csr, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&cim_csr, lmi_get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&cim_csr, ccname); - o = CIM_ComputerSystemRef_ToObjectPath(&cim_csr, NULL); - CMSetClassName(o, ccname); - LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, o); + LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, lmi_get_computer_system()); LMI_UnixDirectory lmi_ud; LMI_UnixDirectory_Init(&lmi_ud, _cb, ns); @@ -351,13 +332,13 @@ CMInstanceMIStub( LMI_RootDirectory, LMI_RootDirectory, _cb, - LMI_RootDirectoryInitialize()) + LMI_RootDirectoryInitialize(ctx)) CMAssociationMIStub( LMI_RootDirectory, LMI_RootDirectory, _cb, - LMI_RootDirectoryInitialize()) + LMI_RootDirectoryInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_SymbolicLinkProvider.c b/src/logicalfile/LMI_SymbolicLinkProvider.c index ea88a8b..5226c6b 100644 --- a/src/logicalfile/LMI_SymbolicLinkProvider.c +++ b/src/logicalfile/LMI_SymbolicLinkProvider.c @@ -23,9 +23,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_SymbolicLinkInitialize() +static void LMI_SymbolicLinkInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SymbolicLinkCleanup( @@ -65,7 +65,7 @@ static CMPIStatus LMI_SymbolicLinkGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_SymbolicLink_InitFromObjectPath(&logicalfile.lf.symboliclink, _cb, cop); @@ -121,7 +121,7 @@ CMInstanceMIStub( LMI_SymbolicLink, LMI_SymbolicLink, _cb, - LMI_SymbolicLinkInitialize()) + LMI_SymbolicLinkInitialize(ctx)) static CMPIStatus LMI_SymbolicLinkMethodCleanup( CMPIMethodMI* mi, @@ -148,7 +148,7 @@ CMMethodMIStub( LMI_SymbolicLink, LMI_SymbolicLink, _cb, - LMI_SymbolicLinkInitialize()) + LMI_SymbolicLinkInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_UnixDeviceFileProvider.c b/src/logicalfile/LMI_UnixDeviceFileProvider.c index 2d48d35..4a924bf 100644 --- a/src/logicalfile/LMI_UnixDeviceFileProvider.c +++ b/src/logicalfile/LMI_UnixDeviceFileProvider.c @@ -23,9 +23,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_UnixDeviceFileInitialize() +static void LMI_UnixDeviceFileInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_UnixDeviceFileCleanup( @@ -65,7 +65,7 @@ static CMPIStatus LMI_UnixDeviceFileGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_UnixDeviceFile_InitFromObjectPath(&logicalfile.lf.unixdevicefile, _cb, cop); @@ -121,7 +121,7 @@ CMInstanceMIStub( LMI_UnixDeviceFile, LMI_UnixDeviceFile, _cb, - LMI_UnixDeviceFileInitialize()) + LMI_UnixDeviceFileInitialize(ctx)) static CMPIStatus LMI_UnixDeviceFileMethodCleanup( CMPIMethodMI* mi, @@ -148,7 +148,7 @@ CMMethodMIStub( LMI_UnixDeviceFile, LMI_UnixDeviceFile, _cb, - LMI_UnixDeviceFileInitialize()) + LMI_UnixDeviceFileInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_UnixDirectoryProvider.c b/src/logicalfile/LMI_UnixDirectoryProvider.c index 04de5cc..af4be57 100644 --- a/src/logicalfile/LMI_UnixDirectoryProvider.c +++ b/src/logicalfile/LMI_UnixDirectoryProvider.c @@ -25,9 +25,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_UnixDirectoryInitialize() +static void LMI_UnixDirectoryInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_UnixDirectoryCleanup( @@ -67,7 +67,7 @@ static CMPIStatus LMI_UnixDirectoryGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_UnixDirectory_InitFromObjectPath(&logicalfile.lf.unixdirectory, _cb, cop); @@ -143,7 +143,7 @@ CMInstanceMIStub( LMI_UnixDirectory, LMI_UnixDirectory, _cb, - LMI_UnixDirectoryInitialize()) + LMI_UnixDirectoryInitialize(ctx)) static CMPIStatus LMI_UnixDirectoryMethodCleanup( CMPIMethodMI* mi, @@ -170,7 +170,7 @@ CMMethodMIStub( LMI_UnixDirectory, LMI_UnixDirectory, _cb, - LMI_UnixDirectoryInitialize()) + LMI_UnixDirectoryInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_UnixFileProvider.c b/src/logicalfile/LMI_UnixFileProvider.c index b9be867..fbe467c 100644 --- a/src/logicalfile/LMI_UnixFileProvider.c +++ b/src/logicalfile/LMI_UnixFileProvider.c @@ -66,9 +66,9 @@ static struct selabel_handle *get_selabel_handle() } #endif -static void LMI_UnixFileInitialize() +static void LMI_UnixFileInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); #ifdef LOGICALFILE_SELINUX pthread_mutex_init(&selinux_mutex, NULL); #endif @@ -121,7 +121,7 @@ static CMPIStatus LMI_UnixFileGetInstance( const char *path; char *fsname; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); if (st.rc != CMPI_RC_OK) { return st; } @@ -226,7 +226,7 @@ CMInstanceMIStub( LMI_UnixFile, LMI_UnixFile, _cb, - LMI_UnixFileInitialize()) + LMI_UnixFileInitialize(ctx)) static CMPIStatus LMI_UnixFileMethodCleanup( CMPIMethodMI* mi, @@ -253,7 +253,7 @@ CMMethodMIStub( LMI_UnixFile, LMI_UnixFile, _cb, - LMI_UnixFileInitialize()) + LMI_UnixFileInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/LMI_UnixSocketProvider.c b/src/logicalfile/LMI_UnixSocketProvider.c index 2da6aad..644c4dd 100644 --- a/src/logicalfile/LMI_UnixSocketProvider.c +++ b/src/logicalfile/LMI_UnixSocketProvider.c @@ -23,9 +23,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_UnixSocketInitialize() +static void LMI_UnixSocketInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_UnixSocketCleanup( @@ -65,7 +65,7 @@ static CMPIStatus LMI_UnixSocketGetInstance( CMPIStatus st = {.rc = CMPI_RC_OK}; logicalfile_t logicalfile; - st = lmi_check_required(_cb, cop); + st = lmi_check_required(_cb, cc, cop); check_status(st); LMI_UnixSocket_InitFromObjectPath(&logicalfile.lf.unixsocket, _cb, cop); @@ -121,7 +121,7 @@ CMInstanceMIStub( LMI_UnixSocket, LMI_UnixSocket, _cb, - LMI_UnixSocketInitialize()) + LMI_UnixSocketInitialize(ctx)) static CMPIStatus LMI_UnixSocketMethodCleanup( CMPIMethodMI* mi, @@ -148,7 +148,7 @@ CMMethodMIStub( LMI_UnixSocket, LMI_UnixSocket, _cb, - LMI_UnixSocketInitialize()) + LMI_UnixSocketInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/logicalfile/file.c b/src/logicalfile/file.c index d2505c2..7796189 100644 --- a/src/logicalfile/file.c +++ b/src/logicalfile/file.c @@ -25,6 +25,7 @@ const char *provider_name = "logicalfile"; CMPIStatus lmi_check_required( const CMPIBroker *b, + const CMPIContext *ctx, const CMPIObjectPath *o) { const char *prop; diff --git a/src/logicalfile/file.h b/src/logicalfile/file.h index 58646f1..09c428a 100644 --- a/src/logicalfile/file.h +++ b/src/logicalfile/file.h @@ -122,7 +122,7 @@ typedef struct { } lf; } logicalfile_t; -CMPIStatus lmi_check_required(const CMPIBroker *, const CMPIObjectPath *); +CMPIStatus lmi_check_required(const CMPIBroker *, const CMPIContext *, const CMPIObjectPath *); void get_class_from_stat(const struct stat *, char *); int get_class_from_path(const char *, char *); CMPIStatus get_fsname_from_stat(const CMPIBroker *, const struct stat *, char **); diff --git a/src/openlmi.c b/src/openlmi.c index de21d3c..1dc1b62 100644 --- a/src/openlmi.c +++ b/src/openlmi.c @@ -30,7 +30,8 @@ #include <cmpimacs.h> #include <glib.h> -static char *_fqdn = NULL; +static char *_system_name = NULL; +static CMPIObjectPath *_computer_system = NULL; static const CMPIBroker *_cb = NULL; static char *_provider = NULL; @@ -60,62 +61,76 @@ static ConfigEntry _toplevel_config_defaults[] = { #define TOPLEVEL_CONFIG_FILE "/etc/openlmi/openlmi.conf" #define PROVIDER_CONFIG_FILE "/etc/openlmi/%s/%s.conf" -/** Gets Fully Quantified Domain Name of the system - * @return FQDN (must be freed by the caller) +/** + * Enumerate configured ComputerSystem class in order to obtain + * ComputerSystem ObjectPath and Hostname + * + * @param cb CMPIBroker + * @param ctx CMPIContext + * @retval true Success + * @retval false Failure */ -static char *getFQDN(void) +static bool get_computer_system(const CMPIBroker *cb, const CMPIContext *ctx) { - struct utsname uts; - if ((uname(&uts) > 0) && (strlen(uts.nodename) > 0)) { - char *nodename; - if ((nodename = strdup(uts.nodename)) == NULL) { - lmi_error("Memory allocation failed"); - return NULL; - } - return nodename; + free(_system_name); + _system_name = NULL; + if (_computer_system != NULL) { + CMRelease(_computer_system); + _computer_system = NULL; } - char hostname[256]; - hostname[255] = '\0'; - if (gethostname(hostname, 255) == -1) { - // FIXME: what to do, if we can't use gethostname? - return NULL; + + const char *class_name = lmi_get_system_creation_class_name(); + const char *namespace = lmi_read_config("CIM", "Namespace"); + CMPIStatus rc = { 0, NULL }; + CMPIObjectPath *op = CMNewObjectPath(cb, namespace, class_name, &rc); + if (rc.rc != CMPI_RC_OK) { + lmi_error("Unable to create object path: %s", rc.msg); + return false; + } + CMPIEnumeration *en = CBEnumInstanceNames(cb, ctx, op, &rc); + if (rc.rc != CMPI_RC_OK) { + lmi_error("Unable to enumerate instance names of class %s", class_name); + return false; } - struct addrinfo hints; - struct addrinfo *info = NULL, *p; - memset(&hints, 0, sizeof hints); - hints.ai_family = AF_UNSPEC; // either IPV4 or IPV6 - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_CANONNAME; - - if (getaddrinfo(hostname, "http", &hints, &info) == 0) { - for (p = info; p != NULL; p = p->ai_next) { - if (p->ai_canonname && strstr(p->ai_canonname, "localhost") == NULL) { - char *dn = strdup(p->ai_canonname); - freeaddrinfo(info); - if (dn == NULL) { - lmi_error("Memory allocation failed"); - return NULL; - } - return dn; - } - } + if (!CMHasNext(en, &rc)) { + lmi_error("No instance of class %s exists", class_name); + CMRelease(en); + return false; + } + CMPIData data = CMGetNext(en, &rc); + if (rc.rc != CMPI_RC_OK) { + lmi_error("Unable to get instance name of class %s", class_name); + CMRelease(en); + return false; } - if (info != NULL) { - freeaddrinfo(info); + if (data.type != CMPI_ref) { + lmi_error("EnumInstanceNames didn't return CMPI_ref type, but %d", data.type); + CMRelease(en); + return false; + } + _computer_system = CMClone(data.value.ref, &rc); + if (rc.rc != CMPI_RC_OK) { + lmi_error("Unable to clone ComputerSystem object path"); + CMRelease(en); + return false; } - return strdup(hostname); + _system_name = strdup(CMGetCharPtr(CMGetKey(_computer_system, "Name", &rc).value.string)); + CMRelease(en); + return true; } -const char *lmi_get_system_name() +CMPIObjectPath *lmi_get_computer_system(void) { - if (_fqdn == NULL) { - _fqdn = getFQDN(); - } - return _fqdn; + return _computer_system; +} + +const char *lmi_get_system_name(void) +{ + return _system_name; } -const char *lmi_get_system_creation_class_name() +const char *lmi_get_system_creation_class_name(void) { if (_system_creation_class_name == NULL) { if (_masterKeyFile == NULL) { @@ -242,7 +257,9 @@ GKeyFile *parse_config(const char *provider_name, const ConfigEntry *provider_co return masterKeyFile; } -void lmi_init(const char *provider, const CMPIBroker *cb, const ConfigEntry *provider_config_defaults) +void lmi_init(const char *provider, const CMPIBroker *cb, + const CMPIContext *ctx, + const ConfigEntry *provider_config_defaults) { pthread_mutex_lock(&_init_mutex); // Broker can change between threads @@ -267,12 +284,13 @@ void lmi_init(const char *provider, const CMPIBroker *cb, const ConfigEntry *pro _masterKeyFile = parse_config(provider, provider_config_defaults); // We might read different log config, reread it in next _log_debug call _log_level = _LMI_DEBUG_NONE; - pthread_mutex_unlock(&_init_mutex); -} -void lmi_init_logging(const char *log_id, const CMPIBroker *cb) -{ - lmi_init(log_id, cb, NULL); + // Read ComputerSystem instance + if (_computer_system == NULL || _system_name == NULL) { + get_computer_system(cb, ctx); + } + + pthread_mutex_unlock(&_init_mutex); } int lmi_log_level(void) diff --git a/src/openlmi.h b/src/openlmi.h index 7d64bd1..9c4b7f5 100644 --- a/src/openlmi.h +++ b/src/openlmi.h @@ -31,13 +31,28 @@ typedef struct { } ConfigEntry; /** - * This function returns FQDN (fully qualified domain name) of the machine + * This function returns object path of an instance of CIM_ComputerSystem + * subclass. + * + * The instance is obtained by enumerating the configured ComputerSystem + * classname. + * + * @warning Call lmi_init function before calling this function! + * + * @return CIM_ComputerSystem object path + */ +CMPIObjectPath *lmi_get_computer_system(void); + +/** + * This function returns system name for the computer system * * @note Use this in the SystemName property of all provider created instances. * + * @warning Call lmi_init function before calling this function! + * * @return The scoping System's Name. */ -const char *lmi_get_system_name(); +const char *lmi_get_system_name(void); /** * This function returns system creation class name @@ -47,7 +62,7 @@ const char *lmi_get_system_name(); * * @return The scoping System's Creation class name. */ -const char *lmi_get_system_creation_class_name(); +const char *lmi_get_system_creation_class_name(void); /** * Initialize usage base openlmi tools like configuration file access, @@ -63,10 +78,12 @@ const char *lmi_get_system_creation_class_name(); * @param provider Identification of the CIM provider (must be same as name of the * configuration file) * @param cb CMPIBroker + * @param ctx CMPIContext * @param provider_config_defaults Array of default config values for given provider * NULL if there is no provider-specific configuration */ void lmi_init(const char *provider, const CMPIBroker *cb, + const CMPIContext *ctx, const ConfigEntry *provider_config_defaults); /** diff --git a/src/power/LMI_AssociatedPowerManagementServiceProvider.c b/src/power/LMI_AssociatedPowerManagementServiceProvider.c index 621fb99..a7748cb 100644 --- a/src/power/LMI_AssociatedPowerManagementServiceProvider.c +++ b/src/power/LMI_AssociatedPowerManagementServiceProvider.c @@ -28,14 +28,16 @@ static const CMPIBroker* _cb; -static void LMI_AssociatedPowerManagementServiceInitialize(CMPIInstanceMI *mi) +static void LMI_AssociatedPowerManagementServiceInitialize(CMPIInstanceMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } -static void LMI_AssociatedPowerManagementServiceAssociationInitialize(CMPIAssociationMI *mi) +static void LMI_AssociatedPowerManagementServiceAssociationInitialize( + CMPIAssociationMI *mi, const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } static CMPIStatus LMI_AssociatedPowerManagementServiceCleanup( @@ -65,19 +67,12 @@ static CMPIStatus LMI_AssociatedPowerManagementServiceEnumInstances( const CMPIObjectPath* cop, const char** properties) { - CMPIStatus rc; const char *ns = KNameSpace(cop); LMI_AssociatedPowerManagementService w; LMI_AssociatedPowerManagementService_Init(&w, _cb, ns); - CIM_ComputerSystemRef computerSystemRef; - CIM_ComputerSystemRef_Init(&computerSystemRef, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&computerSystemRef, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&computerSystemRef, get_system_creation_class_name()); - CMPIObjectPath *computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&computerSystemRef, &rc); - computerSystemOP->ft->setClassName(computerSystemOP, get_system_creation_class_name()); - LMI_AssociatedPowerManagementService_SetObjectPath_UserOfService(&w, computerSystemOP); + LMI_AssociatedPowerManagementService_SetObjectPath_UserOfService(&w, lmi_get_computer_system()); LMI_PowerManagementServiceRef powerManagementServiceRef; LMI_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns); @@ -274,13 +269,13 @@ CMInstanceMIStub( LMI_AssociatedPowerManagementService, LMI_AssociatedPowerManagementService, _cb, - LMI_AssociatedPowerManagementServiceInitialize(&mi)) + LMI_AssociatedPowerManagementServiceInitialize(&mi, ctx)) CMAssociationMIStub( LMI_AssociatedPowerManagementService, LMI_AssociatedPowerManagementService, _cb, - LMI_AssociatedPowerManagementServiceAssociationInitialize(&mi)) + LMI_AssociatedPowerManagementServiceAssociationInitialize(&mi, ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/power/LMI_ElementCapabilitiesProvider.c b/src/power/LMI_ElementCapabilitiesProvider.c index d160bfa..9369511 100644 --- a/src/power/LMI_ElementCapabilitiesProvider.c +++ b/src/power/LMI_ElementCapabilitiesProvider.c @@ -24,7 +24,7 @@ static const CMPIBroker* _cb; -static void LMI_ElementCapabilitiesInitialize() +static void LMI_ElementCapabilitiesInitialize(const CMPIContext *ctx) { } @@ -229,13 +229,13 @@ CMInstanceMIStub( LMI_ElementCapabilities, LMI_ElementCapabilities, _cb, - LMI_ElementCapabilitiesInitialize()) + LMI_ElementCapabilitiesInitialize(ctx)) CMAssociationMIStub( LMI_ElementCapabilities, LMI_ElementCapabilities, _cb, - LMI_ElementCapabilitiesInitialize()) + LMI_ElementCapabilitiesInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/power/LMI_HostedPowerManagementServiceProvider.c b/src/power/LMI_HostedPowerManagementServiceProvider.c index 889dd2c..b41021b 100644 --- a/src/power/LMI_HostedPowerManagementServiceProvider.c +++ b/src/power/LMI_HostedPowerManagementServiceProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb; -static void LMI_HostedPowerManagementServiceInitialize() +static void LMI_HostedPowerManagementServiceInitialize(const CMPIContext *ctx) { } @@ -55,19 +55,12 @@ static CMPIStatus LMI_HostedPowerManagementServiceEnumInstances( const CMPIObjectPath* cop, const char** properties) { - CMPIStatus rc; const char *ns = KNameSpace(cop); LMI_HostedPowerManagementService w; LMI_HostedPowerManagementService_Init(&w, _cb, ns); - CIM_ComputerSystemRef computerSystemRef; - CIM_ComputerSystemRef_Init(&computerSystemRef, _cb, ns); - CIM_ComputerSystemRef_Set_Name(&computerSystemRef, get_system_name()); - CIM_ComputerSystemRef_Set_CreationClassName(&computerSystemRef, get_system_creation_class_name()); - CMPIObjectPath *computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&computerSystemRef, &rc); - computerSystemOP->ft->setClassName(computerSystemOP, get_system_creation_class_name()); - LMI_HostedPowerManagementService_SetObjectPath_Antecedent(&w, computerSystemOP); + LMI_HostedPowerManagementService_SetObjectPath_Antecedent(&w, lmi_get_computer_system()); LMI_PowerManagementServiceRef powerManagementServiceRef; LMI_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns); @@ -233,13 +226,13 @@ CMInstanceMIStub( LMI_HostedPowerManagementService, LMI_HostedPowerManagementService, _cb, - LMI_HostedPowerManagementServiceInitialize()) + LMI_HostedPowerManagementServiceInitialize(ctx)) CMAssociationMIStub( LMI_HostedPowerManagementService, LMI_HostedPowerManagementService, _cb, - LMI_HostedPowerManagementServiceInitialize()) + LMI_HostedPowerManagementServiceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/power/LMI_PowerConcreteJobProvider.c b/src/power/LMI_PowerConcreteJobProvider.c index b6830ab..63da07b 100644 --- a/src/power/LMI_PowerConcreteJobProvider.c +++ b/src/power/LMI_PowerConcreteJobProvider.c @@ -27,14 +27,16 @@ static const CMPIBroker* _cb = NULL; #include "power.h" -static void LMI_PowerConcreteJobInitializeInstance(CMPIInstanceMI *mi) +static void LMI_PowerConcreteJobInitializeInstance(CMPIInstanceMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } -static void LMI_PowerConcreteJobInitializeMethod(CMPIMethodMI *mi) +static void LMI_PowerConcreteJobInitializeMethod(CMPIMethodMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } static CMPIStatus LMI_PowerConcreteJobCleanup( @@ -149,7 +151,7 @@ CMInstanceMIStub( LMI_PowerConcreteJob, LMI_PowerConcreteJob, _cb, - LMI_PowerConcreteJobInitializeInstance(&mi)) + LMI_PowerConcreteJobInitializeInstance(&mi, ctx)) static CMPIStatus LMI_PowerConcreteJobMethodCleanup( CMPIMethodMI* mi, @@ -176,7 +178,7 @@ CMMethodMIStub( LMI_PowerConcreteJob, LMI_PowerConcreteJob, _cb, - LMI_PowerConcreteJobInitializeMethod(&mi)) + LMI_PowerConcreteJobInitializeMethod(&mi, ctx)) KUint32 LMI_PowerConcreteJob_KillJob( const CMPIBroker* cb, diff --git a/src/power/LMI_PowerManagementCapabilitiesProvider.c b/src/power/LMI_PowerManagementCapabilitiesProvider.c index 67a0f0f..1024ea9 100644 --- a/src/power/LMI_PowerManagementCapabilitiesProvider.c +++ b/src/power/LMI_PowerManagementCapabilitiesProvider.c @@ -25,14 +25,16 @@ static const CMPIBroker* _cb = NULL; -static void LMI_PowerManagementCapabilitiesInitialize(CMPIInstanceMI *mi) +static void LMI_PowerManagementCapabilitiesInitialize(CMPIInstanceMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } -static void LMI_PowerManagementCapabilitiesInitializeMethod(CMPIMethodMI *mi) +static void LMI_PowerManagementCapabilitiesInitializeMethod(CMPIMethodMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } static CMPIStatus LMI_PowerManagementCapabilitiesCleanup( @@ -144,7 +146,7 @@ CMInstanceMIStub( LMI_PowerManagementCapabilities, LMI_PowerManagementCapabilities, _cb, - LMI_PowerManagementCapabilitiesInitialize(&mi)) + LMI_PowerManagementCapabilitiesInitialize(&mi, ctx)) static CMPIStatus LMI_PowerManagementCapabilitiesMethodCleanup( CMPIMethodMI* mi, @@ -174,7 +176,7 @@ CMMethodMIStub( LMI_PowerManagementCapabilities, LMI_PowerManagementCapabilities, _cb, - LMI_PowerManagementCapabilitiesInitializeMethod(&mi)) + LMI_PowerManagementCapabilitiesInitializeMethod(&mi, ctx)) KUint16 LMI_PowerManagementCapabilities_CreateGoalSettings( const CMPIBroker* cb, diff --git a/src/power/LMI_PowerManagementServiceProvider.c b/src/power/LMI_PowerManagementServiceProvider.c index 00aebb2..f5256bd 100644 --- a/src/power/LMI_PowerManagementServiceProvider.c +++ b/src/power/LMI_PowerManagementServiceProvider.c @@ -25,14 +25,16 @@ static const CMPIBroker* _cb = NULL; -static void LMI_PowerManagementServiceInitialize(CMPIInstanceMI *mi) +static void LMI_PowerManagementServiceInitialize(CMPIInstanceMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } -static void LMI_PowerManagementServiceMethodInitialize(CMPIMethodMI *mi) +static void LMI_PowerManagementServiceMethodInitialize(CMPIMethodMI *mi, + const CMPIContext *ctx) { - mi->hdl = power_ref(_cb); + mi->hdl = power_ref(_cb, ctx); } @@ -150,7 +152,7 @@ CMInstanceMIStub( LMI_PowerManagementService, LMI_PowerManagementService, _cb, - LMI_PowerManagementServiceInitialize(&mi)) + LMI_PowerManagementServiceInitialize(&mi, ctx)) static CMPIStatus LMI_PowerManagementServiceMethodCleanup( CMPIMethodMI* mi, @@ -179,7 +181,7 @@ CMMethodMIStub( LMI_PowerManagementService, LMI_PowerManagementService, _cb, - LMI_PowerManagementServiceMethodInitialize(&mi)) + LMI_PowerManagementServiceMethodInitialize(&mi, ctx)) KUint32 LMI_PowerManagementService_RequestStateChange( const CMPIBroker* cb, diff --git a/src/power/power.c b/src/power/power.c index bfc6121..646aa45 100644 --- a/src/power/power.c +++ b/src/power/power.c @@ -74,9 +74,9 @@ static size_t job_max_id = 0; Power *_power = NULL; -Power *power_new(const CMPIBroker *_cb) +Power *power_new(const CMPIBroker *_cb, const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); Power *power = malloc(sizeof(Power)); power->broker = _cb; power->instances = 0; @@ -101,10 +101,10 @@ void power_destroy(Power *power) #endif } -Power *power_ref(const CMPIBroker *_cb) +Power *power_ref(const CMPIBroker *_cb, const CMPIContext *ctx) { if (_power == NULL) { - _power = power_new(_cb); + _power = power_new(_cb, ctx); } MUTEX_LOCK(_power); _power->instances++; diff --git a/src/power/power.h b/src/power/power.h index 2f923c8..a533b68 100644 --- a/src/power/power.h +++ b/src/power/power.h @@ -34,7 +34,7 @@ typedef struct _PowerStateChangeJob PowerStateChangeJob; * Get reference to global power object * \note Don't forget to call power_unref */ -Power *power_ref(const CMPIBroker *_cb); +Power *power_ref(const CMPIBroker *_cb, const CMPIContext *ctx); /** * Decrement reference counter for power struct diff --git a/src/realmd/LMI_HostedRealmdServiceProvider.c b/src/realmd/LMI_HostedRealmdServiceProvider.c index 1c06368..37d93fc 100644 --- a/src/realmd/LMI_HostedRealmdServiceProvider.c +++ b/src/realmd/LMI_HostedRealmdServiceProvider.c @@ -6,9 +6,9 @@ static const CMPIBroker* _cb; -static void LMI_HostedRealmdServiceInitialize() +static void LMI_HostedRealmdServiceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_HostedRealmdServiceCleanup( @@ -37,28 +37,19 @@ static CMPIStatus LMI_HostedRealmdServiceEnumInstances( const char** properties) { CMPIStatus status; - CIM_ComputerSystemRef computer_sys_ref; LMI_RealmdServiceRef realmd_service_ref; LMI_HostedRealmdService hosted_realmd_service; - CMPIObjectPath *computer_sys_op = NULL; const char *name_space = KNameSpace(cop); const char *host_name = get_system_name(); CMSetStatus(&status, CMPI_RC_OK); - LMI_InitComputerSystemKeys(CIM_ComputerSystemRef, &computer_sys_ref, - name_space, host_name); - LMI_InitRealmdServiceKeys(LMI_RealmdServiceRef, &realmd_service_ref, name_space, host_name); - computer_sys_op = LMI_RealmdServiceRef_ToObjectPath(&realmd_service_ref, &status); - computer_sys_op->ft->setClassName(computer_sys_op, - get_system_creation_class_name()); - LMI_HostedRealmdService_Init(&hosted_realmd_service, _cb, name_space); LMI_HostedRealmdService_SetObjectPath_Antecedent(&hosted_realmd_service, - computer_sys_op); + lmi_get_computer_system()); LMI_HostedRealmdService_Set_Dependent(&hosted_realmd_service, &realmd_service_ref); @@ -219,13 +210,13 @@ CMInstanceMIStub( LMI_HostedRealmdService, LMI_HostedRealmdService, _cb, - LMI_HostedRealmdServiceInitialize()) + LMI_HostedRealmdServiceInitialize(ctx)) CMAssociationMIStub( LMI_HostedRealmdService, LMI_HostedRealmdService, _cb, - LMI_HostedRealmdServiceInitialize()) + LMI_HostedRealmdServiceInitialize(ctx)) KONKRET_REGISTRATION( "root/cimv2", diff --git a/src/realmd/LMI_RealmdServiceProvider.c b/src/realmd/LMI_RealmdServiceProvider.c index 8ecd381..448fe49 100644 --- a/src/realmd/LMI_RealmdServiceProvider.c +++ b/src/realmd/LMI_RealmdServiceProvider.c @@ -61,9 +61,9 @@ get_joined_domain(GVariant *provider_props) -static void LMI_RealmdServiceInitialize() +static void LMI_RealmdServiceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_RealmdServiceCleanup( @@ -179,7 +179,7 @@ CMInstanceMIStub( LMI_RealmdService, LMI_RealmdService, _cb, - LMI_RealmdServiceInitialize()) + LMI_RealmdServiceInitialize(ctx)) static CMPIStatus LMI_RealmdServiceMethodCleanup( CMPIMethodMI* mi, @@ -206,7 +206,7 @@ CMMethodMIStub( LMI_RealmdService, LMI_RealmdService, _cb, - LMI_RealmdServiceInitialize()) + LMI_RealmdServiceInitialize(ctx)) KUint32 LMI_RealmdService_RequestStateChange( const CMPIBroker* cb, diff --git a/src/realmd/rdcp_util.h b/src/realmd/rdcp_util.h index 5ed0e28..be5d2bb 100644 --- a/src/realmd/rdcp_util.h +++ b/src/realmd/rdcp_util.h @@ -83,15 +83,6 @@ KINLINE unsigned char *octetstring_parse(unsigned char *octetstring, CMPIUint32 \ } - -#define LMI_InitComputerSystemKeys(klass, obj, name_space, host_name) \ -{ \ - klass##_Init(obj, _cb, name_space); \ - klass##_Set_Name(obj, host_name); \ - klass##_Set_CreationClassName(obj, \ - get_system_creation_class_name()); \ -} - void print_properties (GVariant *properties, gchar *format, ...) __attribute__ ((format (printf, 2, 3))); diff --git a/src/service-dbus/LMI_ServiceProvider.c b/src/service-dbus/LMI_ServiceProvider.c index e1329c7..eaf5ec5 100644 --- a/src/service-dbus/LMI_ServiceProvider.c +++ b/src/service-dbus/LMI_ServiceProvider.c @@ -27,9 +27,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_ServiceInitialize() +static void LMI_ServiceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ServiceCleanup( @@ -188,7 +188,7 @@ CMInstanceMIStub( LMI_Service, LMI_Service, _cb, - LMI_ServiceInitialize()) + LMI_ServiceInitialize(ctx)) static CMPIStatus LMI_ServiceMethodCleanup( CMPIMethodMI* mi, @@ -215,7 +215,7 @@ CMMethodMIStub( LMI_Service, LMI_Service, _cb, - LMI_ServiceInitialize()) + LMI_ServiceInitialize(ctx)) KUint32 LMI_Service_RequestStateChange( const CMPIBroker* cb, diff --git a/src/service/LMI_ServiceProvider.c b/src/service/LMI_ServiceProvider.c index 9e15eed..3cd464f 100644 --- a/src/service/LMI_ServiceProvider.c +++ b/src/service/LMI_ServiceProvider.c @@ -27,9 +27,9 @@ static const CMPIBroker* _cb = NULL; -static void LMI_ServiceInitialize() +static void LMI_ServiceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, provider_config_defaults); + lmi_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ServiceCleanup( @@ -174,7 +174,7 @@ CMInstanceMIStub( LMI_Service, LMI_Service, _cb, - LMI_ServiceInitialize()) + LMI_ServiceInitialize(ctx)) static CMPIStatus LMI_ServiceMethodCleanup( CMPIMethodMI* mi, @@ -201,7 +201,7 @@ CMMethodMIStub( LMI_Service, LMI_Service, _cb, - LMI_ServiceInitialize()) + LMI_ServiceInitialize(ctx)) KUint32 LMI_Service_RequestStateChange( const CMPIBroker* cb, |