diff options
author | Radek Novacek <rnovacek@redhat.com> | 2013-10-30 15:51:12 +0100 |
---|---|---|
committer | Radek Novacek <rnovacek@redhat.com> | 2013-10-31 08:53:46 +0100 |
commit | 49394a84fe1235b692fc32d903bf3486e41f76b4 (patch) | |
tree | e702181ad69ea995e48ce103f1f3e2b90fa97597 /src/journald | |
parent | 793843369a4445f8602ef176b41c828730cb4404 (diff) | |
download | openlmi-providers-49394a84fe1235b692fc32d903bf3486e41f76b4.tar.gz openlmi-providers-49394a84fe1235b692fc32d903bf3486e41f76b4.tar.xz openlmi-providers-49394a84fe1235b692fc32d903bf3486e41f76b4.zip |
Add lmi_get_computer_system function and fix lmi_get_system_name
PG_ComputerSystem has different method how to get hostname than our
providers. In order to create the associations to this class we need to
enumerate it. The downside is that all providers must supply CMPIContext
to the lmi_init function.
New function lmi_get_computer_system returns CMPIObjectPath to the
configured CIM_ComputerSystem subclass instance. This object should be
used in all references with ComputerSystem.
Function lmi_get_system_name has been altered to return same value as
ComputerSystem "Name" property.
Diffstat (limited to 'src/journald')
4 files changed, 15 insertions, 15 deletions
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", |