# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1194624608 28800 # Node ID 581a0f3fb078ccb003378d6d5974f5fe4636f123 # Parent 08753448b529043c78b24ebb019485761d8c6d4c Change installed namespace to root/virt - Made namespace a configure option for the source build - Made Makefile postinstall use namespace variable - Updated for HostedService recent addition This one deserves some serious testing, although I was pleasantly surprised at how few instances of the namespace we had hard-coded. We could probably Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r 08753448b529 -r 581a0f3fb078 Makefile.am --- a/Makefile.am Thu Nov 08 19:19:50 2007 -0800 +++ b/Makefile.am Fri Nov 09 08:10:08 2007 -0800 @@ -83,11 +83,11 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pk # Un/Register the providers and class definitions from/to the current CIMOM. # @CIMSERVER@ is set by the configure script postinstall: - sh provider-register.sh -v -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) + sh provider-register.sh -v -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) preuninstall: - sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) + sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) rpm: clean diff -r 08753448b529 -r 581a0f3fb078 configure.ac --- a/configure.ac Thu Nov 08 19:19:50 2007 -0800 +++ b/configure.ac Fri Nov 09 08:10:08 2007 -0800 @@ -34,6 +34,14 @@ AC_ARG_VAR([LIBVIRTDIR],[the directory w AC_ARG_VAR([LIBVIRTDIR],[the directory where the libvirt package is installed.]) AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite is installed. ]) + +AC_ARG_WITH([namespace], + AC_HELP_STRING([--with-namespace=ns], + [CIM namespace to use, default root/virt]), + [test "x$withval" != "x" && CIM_VIRT_NS="$withval"], + [CIM_VIRT_NS="root/virt"]) +AC_SUBST(CIM_VIRT_NS) +AC_DEFINE_UNQUOTED(CIM_VIRT_NS, "$CIM_VIRT_NS", [Namespace for provider source]) AC_ARG_WITH([diskconfig], [ --with-diskconfig=PATH Set config file for disk pool. (default=/tmp/diskpool.conf)], diff -r 08753448b529 -r 581a0f3fb078 doc/libvirt-cim.html --- a/doc/libvirt-cim.html Thu Nov 08 19:19:50 2007 -0800 +++ b/doc/libvirt-cim.html Fri Nov 09 08:10:08 2007 -0800 @@ -73,9 +73,9 @@ $ mkdir cim216<br/> $ cd cim216<br/> $ unzip $PATH_TO_ZIPFILE<br/> - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd cimv216.mof<br/> - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd qualifiers.mof<br/> - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd qualifiers_optional.mof<br/> + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt cimv216.mof<br/> + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers.mof<br/> + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers_optional.mof<br/> </code></p> <h4>To install the schema in SFCB:</h4> diff -r 08753448b529 -r 581a0f3fb078 schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/AllocationCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_AllocationCapabilities root/ibmsd Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance -KVM_AllocationCapabilities root/ibmsd Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +Xen_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +KVM_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance diff -r 08753448b529 -r 581a0f3fb078 schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ComputerSystem.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ComputerSystem root/ibmsd Virt_ComputerSystemProvider Virt_ComputerSystem instance method +Xen_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance method # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ComputerSystem root/ibmsd Virt_ComputerSystemProvider Virt_ComputerSystem instance +KVM_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance diff -r 08753448b529 -r 581a0f3fb078 schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ComputerSystemIndication.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 -Xen_ComputerSystemCreatedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -Xen_ComputerSystemDeletedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -KVM_ComputerSystemCreatedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -KVM_ComputerSystemDeletedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method diff -r 08753448b529 -r 581a0f3fb078 schema/DiskPool.registration --- a/schema/DiskPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/DiskPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,2 +1,2 @@ Xen_DiskPool root/ibmsd Virt_DevicePoolP -Xen_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance -KVM_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +KVM_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 08753448b529 -r 581a0f3fb078 schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ElementAllocatedFromPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ElementAllocatedFromPool root/ibmsd Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association -KVM_ElementAllocatedFromPool root/ibmsd KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file +Xen_ElementAllocatedFromPool root/virt Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association +KVM_ElementAllocatedFromPool root/virt KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ElementConformsToProfile.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,7 +1,7 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -#Xen_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association # Classname Namespace ProviderName ProviderModule ProviderTypes ... -#KVM_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association diff -r 08753448b529 -r 581a0f3fb078 schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/EnabledLogicalElementCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_EnabledLogicalElementCapabilities root/ibmsd Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_EnabledLogicalElementCapabilities root/ibmsd Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance diff -r 08753448b529 -r 581a0f3fb078 schema/HostSystem.registration --- a/schema/HostSystem.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostSystem.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostSystem root/ibmsd Virt_HostSystemProvider Virt_HostSystem instance +Xen_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_HostSystem root/ibmsd Virt_HostSystemProvider Virt_HostSystem instance +KVM_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance diff -r 08753448b529 -r 581a0f3fb078 schema/HostedDependency.registration --- a/schema/HostedDependency.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostedDependency.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostedDependency root/ibmsd Virt_HostedDependencyProvider Virt_HostedDependency association +Xen_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_HostedDependency root/ibmsd Virt_HostedDependencyProvider Virt_HostedDependency association +KVM_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association diff -r 08753448b529 -r 581a0f3fb078 schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostedResourcePool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_HostedResourcePool root/ibmsd Virt_HostedResourcePoolProvider Virt_HostedResourcePool association -KVM_HostedResourcePool root/ibmsd Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file +Xen_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association +KVM_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/HostedService.registration --- a/schema/HostedService.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostedService.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostedService root/ibmsd Xen_HostedServiceProvider Virt_HostedService association -KVM_HostedService root/ibmsd KVM_HostedServiceProvider Virt_HostedService association +Xen_HostedService root/virt Xen_HostedServiceProvider Virt_HostedService association +KVM_HostedService root/virt KVM_HostedServiceProvider Virt_HostedService association diff -r 08753448b529 -r 581a0f3fb078 schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/LogicalDisk.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_LogicalDisk root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_LogicalDisk root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/Memory.registration --- a/schema/Memory.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/Memory.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_Memory root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_Memory root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/MemoryPool.registration --- a/schema/MemoryPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/MemoryPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_MemoryPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_MemoryPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 08753448b529 -r 581a0f3fb078 schema/NetPool.registration --- a/schema/NetPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/NetPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_NetworkPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance -KVM_NetworkPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file +Xen_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +KVM_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/NetworkPort.registration --- a/schema/NetworkPort.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/NetworkPort.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_NetworkPort root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_NetworkPort root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/Processor.registration --- a/schema/Processor.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/Processor.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_Processor root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_Processor root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ProcessorPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ProcessorPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ProcessorPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 08753448b529 -r 581a0f3fb078 schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourceAllocationFromPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourceAllocationFromPool root/ibmsd Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association -KVM_ResourceAllocationFromPool root/ibmsd KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file +Xen_ResourceAllocationFromPool root/virt Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association +KVM_ResourceAllocationFromPool root/virt KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourceAllocationSettingData.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 -Xen_DiskResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_NetResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_ProcResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_MemResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance +Xen_DiskResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_NetResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_ProcResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_MemResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance diff -r 08753448b529 -r 581a0f3fb078 schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourcePoolConfigurationCapabilities root/ibmsd Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance -KVM_ResourcePoolConfigurationCapabilities root/ibmsd Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file +Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance +KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourcePoolConfigurationService.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourcePoolConfigurationService root/ibmsd Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method -KVM_ResourcePoolConfigurationService root/ibmsd Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file +Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method +KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/SettingsDefineCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineCapabilities root/ibmsd Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association -KVM_SettingsDefineCapabilities root/ibmsd KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +Xen_SettingsDefineCapabilities root/virt Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +KVM_SettingsDefineCapabilities root/virt KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association diff -r 08753448b529 -r 581a0f3fb078 schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/SettingsDefineState.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineState root/ibmsd Xen_SettingsDefineStateProvider Virt_SettingsDefineState association -KVM_SettingsDefineState root/ibmsd KVM_SettingsDefineStateProvider Virt_SettingsDefineState association +Xen_SettingsDefineState root/virt Xen_SettingsDefineStateProvider Virt_SettingsDefineState association +KVM_SettingsDefineState root/virt KVM_SettingsDefineStateProvider Virt_SettingsDefineState association diff -r 08753448b529 -r 581a0f3fb078 schema/SystemDevice.registration --- a/schema/SystemDevice.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/SystemDevice.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_SystemDevice root/ibmsd Xen_SystemDeviceProvider Virt_SystemDevice association -KVM_SystemDevice root/ibmsd KVM_SystemDeviceProvider Virt_SystemDevice association +Xen_SystemDevice root/virt Xen_SystemDeviceProvider Virt_SystemDevice association +KVM_SystemDevice root/virt KVM_SystemDeviceProvider Virt_SystemDevice association diff -r 08753448b529 -r 581a0f3fb078 schema/VSSD.registration --- a/schema/VSSD.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VSSD.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemSettingData root/ibmsd Virt_VSSDProvider Virt_VSSD instance -KVM_VirtualSystemSettingData root/ibmsd Virt_VSSDProvider Virt_VSSD instance +Xen_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance +KVM_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance diff -r 08753448b529 -r 581a0f3fb078 schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VSSDComponent.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemSettingDataComponent root/ibmsd Xen_VSSDComponentProvider Virt_VSSDComponent association -KVM_VirtualSystemSettingDataComponent root/ibmsd KVM_VSSDComponentProvider Virt_VSSDComponent association +Xen_VirtualSystemSettingDataComponent root/virt Xen_VSSDComponentProvider Virt_VSSDComponent association +KVM_VirtualSystemSettingDataComponent root/virt KVM_VSSDComponentProvider Virt_VSSDComponent association diff -r 08753448b529 -r 581a0f3fb078 schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VirtualSystemManagementCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemManagementCapabilities root/ibmsd Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_VirtualSystemManagementCapabilities root/ibmsd Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance diff -r 08753448b529 -r 581a0f3fb078 schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VirtualSystemManagementService.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance -KVM_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +Xen_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +KVM_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance diff -r 08753448b529 -r 581a0f3fb078 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Thu Nov 08 19:19:50 2007 -0800 +++ b/src/Virt_ComputerSystemIndication.c Fri Nov 09 08:10:08 2007 -0800 @@ -142,7 +142,7 @@ static bool async_ind(CMPIContext *conte CMPIStatus s; const char *type_name; char *type_cn = NULL; - const char *ns = "root/ibmsd"; + const char *ns = CIM_VIRT_NS; /* FIXME: Hmm, need to get the namespace a better way */ diff -r 08753448b529 -r 581a0f3fb078 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Thu Nov 08 19:19:50 2007 -0800 +++ b/src/Virt_ElementConformsToProfile.c Fri Nov 09 08:10:08 2007 -0800 @@ -34,6 +34,8 @@ #include "profiles.h" #include "std_association.h" +#include "config.h" + #include "Virt_RegisteredProfile.h" /* Associate an XXX_RegisteredProfile to the proper XXX_ManagedElement. @@ -64,7 +66,7 @@ static CMPIStatus elem_instances(const C goto out; } - op = CMNewObjectPath(_BROKER, "/root/ibmsd", classname, &s); + op = CMNewObjectPath(_BROKER, CIM_VIRT_NS, classname, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) goto error;