[Libvirt-cim] [PATCH 2 of 4] Make providers initialize library at load

19 Nov 2007

# HG changeset patch
# User Dan Smith <danms@us.ibm.com>
# Date 1195487992 28800
# Node ID b9d3217689a1335a1a1c2eded1f52ad36f91e978
# Parent  baa6107cec2c6211c262750c097eb2c552816268
Make providers initialize library at load

Also change instance providers to new macro to avoid warnings

Signed-off-by: Dan Smith <danms@us.ibm.com>

diff -r baa6107cec2c -r b9d3217689a1 src/Virt_AllocationCapabilities.c

--- a/src/Virt_AllocationCapabilities.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_AllocationCapabilities.c	Mon Nov 19 07:59:52 2007 -0800
@@ -26,6 +26,8 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "misc_util.h"
 
 #include "Virt_AllocationCapabilities.h"
@@ -101,14 +103,8 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_AllocationCapabilitiesProvider_Create_InstanceMI(const CMPIBroker *,
-                                                      const CMPIContext *,
-                                                      CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_AllocationCapabilitiesProvider, _BROKER, 
-                 CMNoHook);
+STD_InstanceMIStub(, Virt_AllocationCapabilitiesProvider, _BROKER,
+                   libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ComputerSystem.c	Mon Nov 19 07:59:52 2007 -0800
@@ -34,6 +34,7 @@
 #include "libcmpiutil.h"
 #include "misc_util.h"
 #include "std_invokemethod.h"
+#include "std_instance.h"
 
 #include "Virt_ComputerSystem.h"
 
@@ -682,13 +683,7 @@ static CMPIStatus state_change(CMPIMetho
         return s;
 }
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_ComputerSystemProvider_Create_InstanceMI(const CMPIBroker *,
-                                              const CMPIContext *,
-                                              CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_ComputerSystemProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_ComputerSystemProvider, _BROKER, libvirt_cim_init());
 
 static struct method_handler RequestStateChange = {
         .name = "RequestStateChange",
@@ -707,7 +702,7 @@ STDIM_MethodMIStub(,
 STDIM_MethodMIStub(,
                    Virt_ComputerSystemProvider,
                    _BROKER,
-                   CMNoHook,
+                   libvirt_cim_init(),
                    my_handlers);
 
 /*
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ComputerSystemIndication.c
--- a/src/Virt_ComputerSystemIndication.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ComputerSystemIndication.c	Mon Nov 19 07:59:52 2007 -0800
@@ -301,7 +301,7 @@ DEFAULT_MP();
 DEFAULT_MP();
 
 STDI_IndicationMIStub(, Virt_ComputerSystemIndicationProvider,
-                      _BROKER, CMNoHook, &csi);
+                      _BROKER, libvirt_cim_init(), &csi);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_Device.c
--- a/src/Virt_Device.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_Device.c	Mon Nov 19 07:59:52 2007 -0800
@@ -30,6 +30,7 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
 #include "cs_util.h"
 #include "misc_util.h"
 #include "device_parsing.h"
@@ -531,13 +532,7 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_DeviceProvider_Create_InstanceMI(const CMPIBroker *,
-                                      const CMPIContext *,
-                                      CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_DeviceProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_DeviceProvider, _BROKER, libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_DevicePool.c
--- a/src/Virt_DevicePool.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_DevicePool.c	Mon Nov 19 07:59:52 2007 -0800
@@ -39,6 +39,7 @@
 #include "device_parsing.h"
 
 #include <libcmpiutil.h>
+#include <std_instance.h>
 
 #include "Virt_DevicePool.h"
 #include "svpc_types.h"
@@ -718,13 +719,7 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_DevicePoolProvider_Create_InstanceMI(const CMPIBroker *,
-                                          const CMPIContext *,
-                                          CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_DevicePoolProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_DevicePoolProvider, _BROKER, libvirt_cim_init());
 
 
 /*
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ElementAllocatedFromPool.c	Mon Nov 19 07:59:52 2007 -0800
@@ -292,8 +292,8 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Xen_ElementAllocatedFromPoolProvider, _BROKER, CMNoHook, handlers);
-STDA_AssocMIStub(, KVM_ElementAllocatedFromPoolProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Xen_ElementAllocatedFromPoolProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(, KVM_ElementAllocatedFromPoolProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ElementCapabilities.c	Mon Nov 19 07:59:52 2007 -0800
@@ -358,8 +358,8 @@ struct std_assoc *assoc_handlers[] = {
 };
 
 
-STDA_AssocMIStub(, Xen_ElementCapabilitiesProvider, _BROKER, CMNoHook, assoc_handlers);
-STDA_AssocMIStub(, KVM_ElementCapabilitiesProvider, _BROKER, CMNoHook, assoc_handlers);
+STDA_AssocMIStub(, Xen_ElementCapabilitiesProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
+STDA_AssocMIStub(, KVM_ElementCapabilitiesProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
 /*
  * Local Variables:
  * mode: C
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ElementConformsToProfile.c
--- a/src/Virt_ElementConformsToProfile.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ElementConformsToProfile.c	Mon Nov 19 07:59:52 2007 -0800
@@ -225,7 +225,7 @@ struct std_assoc *assoc_handlers[] = {
 };
 
 
-STDA_AssocMIStub(, Virt_ElementConformsToProfileProvider, _BROKER, CMNoHook, assoc_handlers);
+STDA_AssocMIStub(, Virt_ElementConformsToProfileProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
 /*
  * Local Variables:
  * mode: C
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ElementSettingData.c
--- a/src/Virt_ElementSettingData.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ElementSettingData.c	Mon Nov 19 07:59:52 2007 -0800
@@ -147,8 +147,8 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Xen_ElementSettingDataProvider, _BROKER, CMNoHook, handlers);
-STDA_AssocMIStub(, KVM_ElementSettingDataProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Xen_ElementSettingDataProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(, KVM_ElementSettingDataProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_EnabledLogicalElementCapabilities.c
--- a/src/Virt_EnabledLogicalElementCapabilities.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_EnabledLogicalElementCapabilities.c	Mon Nov 19 07:59:52 2007 -0800
@@ -27,6 +27,8 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "misc_util.h"
 #include "device_parsing.h"
 
@@ -201,14 +203,8 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_EnabledLogicalElementCapabilitiesProvider_Create_InstanceMI(const CMPIBroker *,
-                                                                 const CMPIContext *,
-                                                                 CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_EnabledLogicalElementCapabilitiesProvider, _BROKER, 
-                 CMNoHook);
+STD_InstanceMIStub(, Virt_EnabledLogicalElementCapabilitiesProvider, _BROKER,
+                 libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_HostSystem.c
--- a/src/Virt_HostSystem.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_HostSystem.c	Mon Nov 19 07:59:52 2007 -0800
@@ -28,6 +28,8 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "misc_util.h"
 
 #include "Virt_HostSystem.h"
@@ -155,13 +157,7 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_HostSystemProvider_Create_InstanceMI(const CMPIBroker *,
-                                          const CMPIContext *,
-                                          CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_HostSystemProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_HostSystemProvider, _BROKER, libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_HostedDependency.c
--- a/src/Virt_HostedDependency.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_HostedDependency.c	Mon Nov 19 07:59:52 2007 -0800
@@ -150,7 +150,7 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Virt_HostedDependencyProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Virt_HostedDependencyProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_HostedResourcePool.c
--- a/src/Virt_HostedResourcePool.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_HostedResourcePool.c	Mon Nov 19 07:59:52 2007 -0800
@@ -151,7 +151,7 @@ struct std_assoc *assoc_handlers[] = {
 };
 
 
-STDA_AssocMIStub(, Virt_HostedResourcePoolProvider, _BROKER, CMNoHook, assoc_handlers);
+STDA_AssocMIStub(, Virt_HostedResourcePoolProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_HostedService.c
--- a/src/Virt_HostedService.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_HostedService.c	Mon Nov 19 07:59:52 2007 -0800
@@ -164,8 +164,8 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Xen_HostedServiceProvider, _BROKER, CMNoHook, handlers);
-STDA_AssocMIStub(, KVM_HostedServiceProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Xen_HostedServiceProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(, KVM_HostedServiceProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_RASD.c
--- a/src/Virt_RASD.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_RASD.c	Mon Nov 19 07:59:52 2007 -0800
@@ -29,6 +29,8 @@
 #include <cmpimacs.h>
 
 #include <libcmpiutil.h>
+#include <std_instance.h>
+
 #include "device_parsing.h"
 #include "misc_util.h"
 
@@ -313,13 +315,7 @@ DEFAULT_INST_CLEANUP();
 DEFAULT_INST_CLEANUP();
 DEFAULT_EQ();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_RASDProvider_Create_InstanceMI(const CMPIBroker *,
-                                    const CMPIContext *,
-                                    CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_RASDProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_RASDProvider, _BROKER, libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_RegisteredProfile.c
--- a/src/Virt_RegisteredProfile.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_RegisteredProfile.c	Mon Nov 19 07:59:52 2007 -0800
@@ -29,8 +29,10 @@
 #include <cmpift.h>
 #include <cmpimacs.h>
 
+#include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "cs_util.h"
-#include "libcmpiutil.h"
 #include "misc_util.h"
 #include "profiles.h"
 
@@ -186,13 +188,8 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_RegisteredProfileProvider_Create_InstanceMI(const CMPIBroker *,
-                                                 const CMPIContext *,
-                                                 CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_RegisteredProfileProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_RegisteredProfileProvider, _BROKER,
+                   libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ResourceAllocationFromPool.c
--- a/src/Virt_ResourceAllocationFromPool.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ResourceAllocationFromPool.c	Mon Nov 19 07:59:52 2007 -0800
@@ -277,8 +277,8 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Xen_ResourceAllocationFromPoolProvider, _BROKER, CMNoHook, handlers);
-STDA_AssocMIStub(, KVM_ResourceAllocationFromPoolProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Xen_ResourceAllocationFromPoolProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(, KVM_ResourceAllocationFromPoolProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ResourcePoolConfigurationCapabilities.c
--- a/src/Virt_ResourcePoolConfigurationCapabilities.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ResourcePoolConfigurationCapabilities.c	Mon Nov 19 07:59:52 2007 -0800
@@ -27,6 +27,8 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "misc_util.h"
 
 const static CMPIBroker *_BROKER;
@@ -112,14 +114,8 @@ static CMPIStatus GetInstance(CMPIInstan
 }
 
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_ResourcePoolConfigurationCapabilitiesProvider_Create_InstanceMI(const CMPIBroker *,
-                                                                    const CMPIContext *,
-                                                                    CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_ResourcePoolConfigurationCapabilitiesProvider, _BROKER,
-                 CMNoHook);
+STD_InstanceMIStub(, Virt_ResourcePoolConfigurationCapabilitiesProvider,
+                   _BROKER, libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_ResourcePoolConfigurationService.c
--- a/src/Virt_ResourcePoolConfigurationService.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_ResourcePoolConfigurationService.c	Mon Nov 19 07:59:52 2007 -0800
@@ -24,6 +24,7 @@
 
 #include <libcmpiutil.h>
 #include <std_invokemethod.h>
+#include <std_instance.h>
 
 #include "misc_util.h"
 
@@ -82,7 +83,7 @@ static struct method_handler *my_handler
 };
 
 STDIM_MethodMIStub(, Virt_ResourcePoolConfigurationServiceProvider,
-                   _BROKER, CMNoHook, my_handlers);
+                   _BROKER, libvirt_cim_init(), my_handlers);
 
 DEFAULT_CI();
 DEFAULT_MI();
@@ -203,13 +204,8 @@ static CMPIStatus EnumInstances(CMPIInst
 }
 
 
-CMPIInstanceMI *
-Virt_ResourcePoolConfigurationServiceProvider_Create_InstanceMI(const CMPIBroker *,
-                                              const CMPIContext *,
-                                              CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_ResourcePoolConfigurationServiceProvider,
-                 _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_ResourcePoolConfigurationServiceProvider,
+                   _BROKER, libvirt_cim_init());
 
 
 /*
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_SettingsDefineCapabilities.c	Mon Nov 19 07:59:52 2007 -0800
@@ -872,8 +872,8 @@ struct std_assoc *assoc_handlers[] = {
 };
 
 
-STDA_AssocMIStub(, Xen_SettingsDefineCapabilitiesProvider, _BROKER, CMNoHook, assoc_handlers);
-STDA_AssocMIStub(, KVM_SettingsDefineCapabilitiesProvider, _BROKER, CMNoHook, assoc_handlers);
+STDA_AssocMIStub(, Xen_SettingsDefineCapabilitiesProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
+STDA_AssocMIStub(, KVM_SettingsDefineCapabilitiesProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_SettingsDefineState.c	Mon Nov 19 07:59:52 2007 -0800
@@ -365,8 +365,8 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Xen_SettingsDefineStateProvider, _BROKER, CMNoHook, handlers);
-STDA_AssocMIStub(, KVM_SettingsDefineStateProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Xen_SettingsDefineStateProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(, KVM_SettingsDefineStateProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_SystemDevice.c
--- a/src/Virt_SystemDevice.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_SystemDevice.c	Mon Nov 19 07:59:52 2007 -0800
@@ -265,8 +265,8 @@ static struct std_assoc *assoc_handlers[
         NULL
 };
 
-STDA_AssocMIStub(, Xen_SystemDeviceProvider, _BROKER, CMNoHook, assoc_handlers);
-STDA_AssocMIStub(, KVM_SystemDeviceProvider, _BROKER, CMNoHook, assoc_handlers);
+STDA_AssocMIStub(, Xen_SystemDeviceProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
+STDA_AssocMIStub(, KVM_SystemDeviceProvider, _BROKER, libvirt_cim_init(), assoc_handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_VSSD.c
--- a/src/Virt_VSSD.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_VSSD.c	Mon Nov 19 07:59:52 2007 -0800
@@ -28,6 +28,8 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "cs_util.h"
 #include "misc_util.h"
 #include "device_parsing.h"
@@ -260,13 +262,7 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_VSSDProvider_Create_InstanceMI(const CMPIBroker *,
-                                    const CMPIContext *,
-                                    CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_VSSDProvider, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_VSSDProvider, _BROKER, libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_VSSDComponent.c
--- a/src/Virt_VSSDComponent.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_VSSDComponent.c	Mon Nov 19 07:59:52 2007 -0800
@@ -202,8 +202,8 @@ static struct std_assoc *handlers[] = {
         NULL
 };
 
-STDA_AssocMIStub(, Xen_VSSDComponentProvider, _BROKER, CMNoHook, handlers);
-STDA_AssocMIStub(, KVM_VSSDComponentProvider, _BROKER, CMNoHook, handlers);
+STDA_AssocMIStub(, Xen_VSSDComponentProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(, KVM_VSSDComponentProvider, _BROKER, libvirt_cim_init(), handlers);
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_VirtualSystemManagementCapabilities.c
--- a/src/Virt_VirtualSystemManagementCapabilities.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_VirtualSystemManagementCapabilities.c	Mon Nov 19 07:59:52 2007 -0800
@@ -27,6 +27,8 @@
 #include <cmpimacs.h>
 
 #include "libcmpiutil.h"
+#include "std_instance.h"
+
 #include "misc_util.h"
 #include "device_parsing.h"
 
@@ -188,14 +190,8 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_VirtualSystemManagementCapabilitiesProvider_Create_InstanceMI(const CMPIBroker *,
-                                                                   const CMPIContext *,
-                                                                   CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_VirtualSystemManagementCapabilitiesProvider, _BROKER, 
-                 CMNoHook);
+STD_InstanceMIStub(, Virt_VirtualSystemManagementCapabilitiesProvider, _BROKER,
+                 libvirt_cim_init());
 
 /*
  * Local Variables:
diff -r baa6107cec2c -r b9d3217689a1 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Mon Nov 19 07:59:44 2007 -0800
+++ b/src/Virt_VirtualSystemManagementService.c	Mon Nov 19 07:59:52 2007 -0800
@@ -36,9 +36,10 @@
 #include "xmlgen.h"
 
 #include "libcmpiutil.h"
-
 #include "std_invokemethod.h"
 #include "std_indication.h"
+#include "std_instance.h"
+
 #include "misc_util.h"
 
 #include "Virt_VirtualSystemManagementService.h"
@@ -1020,7 +1021,7 @@ static struct method_handler *my_handler
 };
 
 STDIM_MethodMIStub(, Virt_VirtualSystemManagementService,
-                   _BROKER, CMNoHook, my_handlers);
+                   _BROKER, libvirt_cim_init(), my_handlers);
 
 CMPIStatus get_vsms(const CMPIObjectPath *reference,
                     CMPIInstance **_inst,
@@ -1150,13 +1151,8 @@ DEFAULT_EQ();
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
-/* Avoid a warning in the stub macro below */
-CMPIInstanceMI *
-Virt_VirtualSystemManagementService_Create_InstanceMI(const CMPIBroker *,
-                                                      const CMPIContext *,
-                                                      CMPIStatus *rc);
-
-CMInstanceMIStub(, Virt_VirtualSystemManagementService, _BROKER, CMNoHook);
+STD_InstanceMIStub(, Virt_VirtualSystemManagementService, _BROKER,
+                   libvirt_cim_init());
 
 
 /*

    