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.

36 files changed, 150 insertions, 210 deletions

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",