
# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1198182618 -3600 # Node ID 165b9b102ac9c2650eda92b18a39991585b33755 # Parent 5cb5f3e499759a36e2c978084e0fc80086952364 DiskPool, MemoryPool, NetPool, ProcessorPool: OpenWbem support - rename provider from DevicePoolProvider to DevicePool - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/DiskPool.mof --- a/schema/DiskPool.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/DiskPool.mof Thu Dec 20 21:30:18 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_DevicePool")] class Xen_DiskPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] class KVM_DiskPool : CIM_ResourcePool { }; diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/DiskPool.registration --- a/schema/DiskPool.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/DiskPool.registration Thu Dec 20 21:30:18 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance -KVM_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +Xen_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/MemoryPool.mof --- a/schema/MemoryPool.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/MemoryPool.mof Thu Dec 20 21:30:18 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_DevicePool")] class Xen_MemoryPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] class KVM_MemoryPool : CIM_ResourcePool { }; diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/MemoryPool.registration --- a/schema/MemoryPool.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/MemoryPool.registration Thu Dec 20 21:30:18 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance -KVM_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +Xen_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/NetPool.mof --- a/schema/NetPool.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/NetPool.mof Thu Dec 20 21:30:18 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_DevicePool")] class Xen_NetworkPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] class KVM_NetworkPool : CIM_ResourcePool { }; diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/NetPool.registration --- a/schema/NetPool.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/NetPool.registration Thu Dec 20 21:30:18 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance -KVM_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file +Xen_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance \ No newline at end of file diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/ProcessorPool.mof --- a/schema/ProcessorPool.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/ProcessorPool.mof Thu Dec 20 21:30:18 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_DevicePool")] class Xen_ProcessorPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] class KVM_ProcessorPool : CIM_ResourcePool { }; diff -r 5cb5f3e49975 -r 165b9b102ac9 schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/ProcessorPool.registration Thu Dec 20 21:30:18 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance -KVM_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +Xen_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r 5cb5f3e49975 -r 165b9b102ac9 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Thu Dec 20 21:30:18 2007 +0100 +++ b/src/Virt_DevicePool.c Thu Dec 20 21:30:18 2007 +0100 @@ -774,7 +774,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_DevicePoolProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_DevicePool, + _BROKER, + libvirt_cim_init()); /*