[PATCH 00 of 29] #2 - Enable libvirt-cim providers for OpenWbem - CIM

[PATCH 00 of 29] #2 - Enable libvirt-cim providers for OpenWbem

report Xen_HostSystem parsing...

[PATCH 00 of 29] Enable...

Heidi Eckhart

Thursday, 20 December 2007 Thu, 20 Dec '07

8:34 p.m.

updated schema and provider registration scripts added "Provider" qualifier to each provider's mof fixed provider and module naming Diff to #1: - patch 1: registration for interop namespace must be root/interop instead of /root/interop for OpenWbem - patch 7: forgot to rename provider in src file - patch 17: fixed hg header - patch 19: forgot to rename provider of MethodMI

Show replies by date

Heidi Eckhart

Thursday, 20 December Thu, 20 Dec

8:34 p.m.

New subject: [PATCH 01 of 29] Added installation support for openWbem

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182611 -3600 # Node ID 6d6ab1dddcdc4835de7c492635f531ed4797a736 # Parent 133cbb1df893f2d031cba3534c88936bce69da78 Added installation support for openWbem Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 133cbb1df893 -r 6d6ab1dddcdc Makefile.am --- a/Makefile.am Wed Dec 19 11:16:08 2007 +0100 +++ b/Makefile.am Thu Dec 20 21:30:11 2007 +0100 @@ -96,11 +96,11 @@ preinstall: # @CIMSERVER@ is set by the configure script postinstall: 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) + 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 @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) - sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) + sh provider-register.sh -v -d -t @CIMSERVER@ -n root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) diff -r 133cbb1df893 -r 6d6ab1dddcdc base_schema/install_base_schema.sh.in --- a/base_schema/install_base_schema.sh.in Wed Dec 19 11:16:08 2007 +0100 +++ b/base_schema/install_base_schema.sh.in Thu Dec 20 21:30:11 2007 +0100 @@ -3,6 +3,7 @@ DATA="$1" DATA="$1" NS=@CIM_VIRT_NS@ CIMOM=@CIMSERVER@ +SCHEMA_VERSION="2.16" TMPDIR=$(mktemp -d /tmp/cim_schema.XXXXX) @@ -44,6 +45,17 @@ detect_sfcb_dir() { done } +detect_openwbem_dir() { + dirs="/usr/share/mof" + + for d in $dirs; do + if [ -d "$d" ]; then + echo $d + return + fi + done +} + install_schema_pegasus() { local repo=$(detect_peg_repo) @@ -76,6 +88,26 @@ install_schema_sfcb() { sfcbrepos -f } +install_schema_openwbem() { + local dir=$(detect_openwbem_dir) + local schema_dir=$dir/cimv$SCHEMA_VERSION + + mkdir $schema_dir + if [ -d "$schema_dir" ]; then + echo "Unable to determine openwbem schema directory" + return + fi + + cp ${TMPDIR}/cimv???.mof ${TMPDIR}/CIM_Schema.mof + cp -ra ${TMPDIR}/* $schema_dir + + owcreatenamespace -u http://localhost/ -n root/virt + owmofc -u http://localhost/cimom -n root/virt $schema_dir/CIM_Schema.mof + + owcreatenamespace -u http://localhost/ -n root/interop + owmofc -u http://localhost/cimom -n root/interop $schema_dir/cimv???-interop.mof +} + if [ -z "$1" ]; then echo "Usage: $0 [source_dir]" exit 1 @@ -91,6 +123,9 @@ case "$CIMOM" in pegasus) (install_schema_pegasus) >>$DEBUG 2>&1 ;; + openwbem) + (install_schema_openwbem) >>$DEBUG 2>&1 + ;; *) echo ERROR: Unknown CIMOM: $CIMOM ;; diff -r 133cbb1df893 -r 6d6ab1dddcdc provider-register.sh --- a/provider-register.sh Wed Dec 19 11:16:08 2007 +0100 +++ b/provider-register.sh Thu Dec 20 21:30:11 2007 +0100 @@ -477,7 +477,7 @@ openwbem_transform() then for _f in $moffiles do - sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >> $OUTFILE + cat $_f >> $OUTFILE done fi } @@ -497,6 +497,9 @@ openwbem_repository() openwbem_install() { + namespace=$1 + shift + CIMMOF=`which owmofc 2> /dev/null` if test $? != 0 then @@ -531,7 +534,7 @@ openwbem_install() if openwbem_transform $_REGFILENAME $* then chatter Registering providers with $state owcimomd - $CIMMOF $_REGFILENAME > /dev/null + $CIMMOF -u http://localhost/cimom -n $namespace $_REGFILENAME > /dev/null else echo "Failed to build OpenWBEM registration MOF." >&2 return 1 @@ -540,6 +543,9 @@ openwbem_install() openwbem_uninstall() { + namespace=$1 + shift + CIMMOF=`which owmofc 2> /dev/null` if test $? != 0 then @@ -728,7 +734,7 @@ then case $cimserver in pegasus) pegasus_install $namespace $mofs ":" $regs;; sfcb) sfcb_install $namespace $mofs ":" $regs;; - openwbem) openwbem_install $mofs ;; + openwbem) openwbem_install $namespace $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac @@ -736,7 +742,7 @@ else case $cimserver in pegasus) pegasus_uninstall $namespace $mofs ":" $regs;; sfcb) sfcb_uninstall $namespace $mofs ":" $regs;; - openwbem) openwbem_uninstall $mofs ;; + openwbem) openwbem_uninstall $namespace $mofs ;; sniacimom) echo sniacimom not yet supported && exit 1 ;; **) echo "Invalid CIM Server Type " $cimserver && exit 1;; esac

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 02 of 29] HostSystem: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182615 -3600 # Node ID 3a6249849fabbdd217fd0ce0d2f697443c8b27ce # Parent 6d6ab1dddcdc4835de7c492635f531ed4797a736 HostSystem: OpenWbem support - rename provider from HostSystemProvider to HostSystem - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 6d6ab1dddcdc -r 3a6249849fab schema/HostSystem.mof --- a/schema/HostSystem.mof Thu Dec 20 21:30:11 2007 +0100 +++ b/schema/HostSystem.mof Thu Dec 20 21:30:15 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_ComputerSystem to represent " - "the Xen host system.") + "the Xen host system."), + Provider("cmpi::Virt_HostSystem") ] class Xen_HostSystem : CIM_ComputerSystem { @@ -10,7 +11,8 @@ class Xen_HostSystem : CIM_ComputerSyste [Description ( "A class derived from CIM_ComputerSystem to represent " - "the KVM host system.") + "the KVM host system."), + Provider("cmpi::Virt_HostSystem") ] class KVM_HostSystem : CIM_ComputerSystem { diff -r 6d6ab1dddcdc -r 3a6249849fab schema/HostSystem.registration --- a/schema/HostSystem.registration Thu Dec 20 21:30:11 2007 +0100 +++ b/schema/HostSystem.registration Thu Dec 20 21:30:15 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance -KVM_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance +Xen_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance +KVM_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance diff -r 6d6ab1dddcdc -r 3a6249849fab src/Virt_HostSystem.c --- a/src/Virt_HostSystem.c Thu Dec 20 21:30:11 2007 +0100 +++ b/src/Virt_HostSystem.c Thu Dec 20 21:30:15 2007 +0100 @@ -173,7 +173,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_HostSystemProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_HostSystem, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 03 of 29] ComputerSystem: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182617 -3600 # Node ID 4de9b4472c5357a0bd51a26b96e19079e7e7913b # Parent 3a6249849fabbdd217fd0ce0d2f697443c8b27ce ComputerSystem: OpenWbem support - rename provider from ComputerSystemProvider to ComputerSystem - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 3a6249849fab -r 4de9b4472c53 schema/ComputerSystem.mof --- a/schema/ComputerSystem.mof Thu Dec 20 21:30:15 2007 +0100 +++ b/schema/ComputerSystem.mof Thu Dec 20 21:30:17 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_ComputerSystem to represent " - "the Xen virtual machines/domains running on the system.") + "the Xen virtual machines/domains running on the system."), + Provider("cmpi::Virt_ComputerSystem") ] class Xen_ComputerSystem : CIM_ComputerSystem { @@ -14,7 +15,8 @@ class Xen_ComputerSystem : CIM_ComputerS [Description ( "A class derived from CIM_ComputerSystem to represent " - "the KVM virtual machines running on the system.") + "the KVM virtual machines running on the system."), + Provider("cmpi::Virt_ComputerSystem") ] class KVM_ComputerSystem : CIM_ComputerSystem { diff -r 3a6249849fab -r 4de9b4472c53 schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Thu Dec 20 21:30:15 2007 +0100 +++ b/schema/ComputerSystem.registration Thu Dec 20 21:30:17 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance method -KVM_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance +Xen_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance method +KVM_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance diff -r 3a6249849fab -r 4de9b4472c53 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Thu Dec 20 21:30:15 2007 +0100 +++ b/src/Virt_ComputerSystem.c Thu Dec 20 21:30:17 2007 +0100 @@ -680,7 +680,10 @@ static CMPIStatus state_change(CMPIMetho return s; } -STD_InstanceMIStub(, Virt_ComputerSystemProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_ComputerSystem, + _BROKER, + libvirt_cim_init()); static struct method_handler RequestStateChange = { .name = "RequestStateChange", @@ -697,7 +700,7 @@ static struct method_handler *my_handler }; STDIM_MethodMIStub(, - Virt_ComputerSystemProvider, + Virt_ComputerSystem, _BROKER, libvirt_cim_init(), my_handlers);

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 04 of 29] HostedDependency: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182618 -3600 # Node ID def7d71ec42294a074768f38845a0449520a4e41 # Parent 4de9b4472c5357a0bd51a26b96e19079e7e7913b HostedDependency: OpenWbem support - rename provider from HostedDependencyProvider to HostedDependency - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 4de9b4472c53 -r def7d71ec422 schema/HostedDependency.mof --- a/schema/HostedDependency.mof Thu Dec 20 21:30:17 2007 +0100 +++ b/schema/HostedDependency.mof Thu Dec 20 21:30:18 2007 +0100 @@ -3,7 +3,8 @@ [Association, Description ( "HostedDependency defines a ManagedElement in the context of " - "another ManagedElement in which it resides.") + "another ManagedElement in which it resides."), + Provider("cmpi::Virt_HostedDependency") ] class Xen_HostedDependency : CIM_HostedDependency { @@ -12,7 +13,8 @@ class Xen_HostedDependency : CIM_HostedD [Association, Description ( "HostedDependency defines a ManagedElement in the context of " - "another ManagedElement in which it resides.") + "another ManagedElement in which it resides."), + Provider("cmpi::Virt_HostedDependency") ] class KVM_HostedDependency : CIM_HostedDependency { diff -r 4de9b4472c53 -r def7d71ec422 schema/HostedDependency.registration --- a/schema/HostedDependency.registration Thu Dec 20 21:30:17 2007 +0100 +++ b/schema/HostedDependency.registration Thu Dec 20 21:30:18 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association -KVM_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association +Xen_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association +KVM_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association diff -r 4de9b4472c53 -r def7d71ec422 src/Virt_HostedDependency.c --- a/src/Virt_HostedDependency.c Thu Dec 20 21:30:17 2007 +0100 +++ b/src/Virt_HostedDependency.c Thu Dec 20 21:30:18 2007 +0100 @@ -134,7 +134,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_HostedDependencyProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_HostedDependency, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 05 of 29] AllocationCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182618 -3600 # Node ID 5cb5f3e499759a36e2c978084e0fc80086952364 # Parent def7d71ec42294a074768f38845a0449520a4e41 AllocationCapabilities: OpenWbem support - rename provider from AllocationCapabilitiesProvider to AllocationCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r def7d71ec422 -r 5cb5f3e49975 schema/AllocationCapabilities.mof --- a/schema/AllocationCapabilities.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/AllocationCapabilities.mof Thu Dec 20 21:30:18 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_AllocationCapabilities")] class Xen_AllocationCapabilities : CIM_AllocationCapabilities { }; +[Provider("cmpi::Virt_AllocationCapabilities")] class KVM_AllocationCapabilities : CIM_AllocationCapabilities { }; diff -r def7d71ec422 -r 5cb5f3e49975 schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/AllocationCapabilities.registration Thu Dec 20 21:30:18 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance -KVM_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +Xen_AllocationCapabilities root/virt Virt_AllocationCapabilities Virt_AllocationCapabilities instance +KVM_AllocationCapabilities root/virt Virt_AllocationCapabilities Virt_AllocationCapabilities instance diff -r def7d71ec422 -r 5cb5f3e49975 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Thu Dec 20 21:30:18 2007 +0100 +++ b/src/Virt_AllocationCapabilities.c Thu Dec 20 21:30:18 2007 +0100 @@ -211,7 +211,9 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_AllocationCapabilitiesProvider, _BROKER, +STD_InstanceMIStub(, + Virt_AllocationCapabilities, + _BROKER, libvirt_cim_init()); /*

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 06 of 29] DiskPool, MemoryPool, NetPool, ProcessorPool: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)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(a)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()); /*

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 07 of 29] LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182619 -3600 # Node ID 9379cc0f82c0c0e78a80c1cb721486928b93af66 # Parent 165b9b102ac9c2650eda92b18a39991585b33755 LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support - rename provider from DeviceProvider to Device - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/LogicalDisk.mof --- a/schema/LogicalDisk.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/LogicalDisk.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_LogicalDisk to represent " - "the Xen virtual disks on the system.") + "the Xen virtual disks on the system."), + Provider("cmpi::Virt_Device") ] class Xen_LogicalDisk : CIM_LogicalDisk { @@ -10,7 +11,8 @@ class Xen_LogicalDisk : CIM_LogicalDisk [Description ( "A class derived from CIM_LogicalDisk to represent " - "the KVM virtual disks on the system.") + "the KVM virtual disks on the system."), + Provider("cmpi::Virt_Device") ] class KVM_LogicalDisk : CIM_LogicalDisk { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/LogicalDisk.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance -KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance +Xen_LogicalDisk root/virt Virt_Device Virt_Device instance +KVM_LogicalDisk root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Memory.mof --- a/schema/Memory.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Memory.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_Memory to represent " - "the Xen virtual memory.") + "the Xen virtual memory."), + Provider("cmpi::Virt_Device") ] class Xen_Memory : CIM_Memory { @@ -10,7 +11,8 @@ class Xen_Memory : CIM_Memory [Description ( "A class derived from CIM_Memory to represent " - "the KVM virtual memory.") + "the KVM virtual memory."), + Provider("cmpi::Virt_Device") ] class KVM_Memory : CIM_Memory { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Memory.registration --- a/schema/Memory.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Memory.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance -KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance +Xen_Memory root/virt Virt_Device Virt_Device instance +KVM_Memory root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/NetworkPort.mof --- a/schema/NetworkPort.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/NetworkPort.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_NetworkPort to represent " - "the Xen virtual network interfaces on the system.") + "the Xen virtual network interfaces on the system."), + Provider("cmpi::Virt_Device") ] class Xen_NetworkPort : CIM_NetworkPort { @@ -10,7 +11,8 @@ class Xen_NetworkPort : CIM_NetworkPort [Description ( "A class derived from CIM_NetworkPort to represent " - "the KVM virtual network interfaces on the system.") + "the KVM virtual network interfaces on the system."), + Provider("cmpi::Virt_Device") ] class KVM_NetworkPort : CIM_NetworkPort { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/NetworkPort.registration --- a/schema/NetworkPort.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/NetworkPort.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance -KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance +Xen_NetworkPort root/virt Virt_Device Virt_Device instance +KVM_NetworkPort root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Processor.mof --- a/schema/Processor.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Processor.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_Processor to represent " - "the Xen virtual processors.") + "the Xen virtual processors."), + Provider("cmpi::Virt_Device") ] class Xen_Processor : CIM_Processor { @@ -10,7 +11,8 @@ class Xen_Processor : CIM_Processor [Description ( "A class derived from CIM_Processor to represent " - "the KVM virtual processors.") + "the KVM virtual processors."), + Provider("cmpi::Virt_Device") ] class KVM_Processor : CIM_Processor { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Processor.registration --- a/schema/Processor.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Processor.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance -KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance +Xen_Processor root/virt Virt_Device Virt_Device instance +KVM_Processor root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 src/Virt_Device.c --- a/src/Virt_Device.c Thu Dec 20 21:30:18 2007 +0100 +++ b/src/Virt_Device.c Thu Dec 20 21:30:19 2007 +0100 @@ -546,7 +546,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_DeviceProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_Device, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 08 of 29] ElementAllocatedFromPool: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182619 -3600 # Node ID a5d96949d5736e72957adb8eaa511e4b8d4d7aee # Parent 9379cc0f82c0c0e78a80c1cb721486928b93af66 ElementAllocatedFromPool: OpenWbem support - rename provider from ElementAllocatedFromPoolProvider to ElementAllocatedFromPool - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 9379cc0f82c0 -r a5d96949d573 schema/ElementAllocatedFromPool.mof --- a/schema/ElementAllocatedFromPool.mof Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementAllocatedFromPool.mof Thu Dec 20 21:30:19 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_ElementAllocatedFromPool") +] class Xen_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { }; -[Association] +[Association, + Provider("cmpi::Virt_ElementAllocatedFromPool") +] class KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { }; diff -r 9379cc0f82c0 -r a5d96949d573 schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementAllocatedFromPool.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association -KVM_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association +Xen_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool Virt_ElementAllocatedFromPool association +KVM_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool Virt_ElementAllocatedFromPool association diff -r 9379cc0f82c0 -r a5d96949d573 src/Virt_ElementAllocatedFromPool.c --- a/src/Virt_ElementAllocatedFromPool.c Thu Dec 20 21:30:19 2007 +0100 +++ b/src/Virt_ElementAllocatedFromPool.c Thu Dec 20 21:30:19 2007 +0100 @@ -311,7 +311,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_ElementAllocatedFromPoolProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_ElementAllocatedFromPool, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 09 of 29] ElementCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182619 -3600 # Node ID fdba4d9de9660421b2cb1749951404ed5aa8bdaa # Parent a5d96949d5736e72957adb8eaa511e4b8d4d7aee ElementCapabilities: OpenWbem support - rename provider from ElementCapabilitiesProvider to ElementCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r a5d96949d573 -r fdba4d9de966 schema/ElementCapabilities.mof --- a/schema/ElementCapabilities.mof Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementCapabilities.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Association, Description ( - "A class to associate a ManagedElement with its Capabilities.") + "A class to associate a ManagedElement with its Capabilities."), + Provider("cmpi::Virt_ElementCapabilities") ] class Xen_ElementCapabilities : CIM_ElementCapabilities { @@ -10,7 +11,8 @@ class Xen_ElementCapabilities : CIM_Elem [Association, Description ( - "A class to associate a ManagedElement with its Capabilities.") + "A class to associate a ManagedElement with its Capabilities."), + Provider("cmpi::Virt_ElementCapabilities") ] class KVM_ElementCapabilities : CIM_ElementCapabilities { diff -r a5d96949d573 -r fdba4d9de966 schema/ElementCapabilities.registration --- a/schema/ElementCapabilities.registration Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementCapabilities.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ElementCapabilities root/virt Virt_ElementCapabilitiesProvider Virt_ElementCapabilities association -KVM_ElementCapabilities root/virt Virt_ElementCapabilitiesProvider Virt_ElementCapabilities association +Xen_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities association +KVM_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities association diff -r a5d96949d573 -r fdba4d9de966 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Thu Dec 20 21:30:19 2007 +0100 +++ b/src/Virt_ElementCapabilities.c Thu Dec 20 21:30:19 2007 +0100 @@ -350,7 +350,11 @@ struct std_assoc *assoc_handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_ElementCapabilitiesProvider, _BROKER, libvirt_cim_init(), assoc_handlers); +STDA_AssocMIStub(, + Virt_ElementCapabilities, + _BROKER, + libvirt_cim_init(), + assoc_handlers); /* * Local Variables: * mode: C

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 10 of 29] ElementConformsToProfile: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182619 -3600 # Node ID d4e7585a3f53a347b655f74ff9948d2cec5e6aa0 # Parent fdba4d9de9660421b2cb1749951404ed5aa8bdaa ElementConformsToProfile: OpenWbem support - rename provider from ElementConformsToProfileProvider to ElementConformsToProfile - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r fdba4d9de966 -r d4e7585a3f53 schema/ElementConformsToProfile.mof --- a/schema/ElementConformsToProfile.mof Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementConformsToProfile.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Association, Description ( - "A class to associate a ManagedElement with its RegisteredProfile.") + "A class to associate a ManagedElement with its RegisteredProfile."), + Provider("cmpi::Virt_ElementConformsToProfile") ] class Xen_ElementConformsToProfile : CIM_ElementConformsToProfile { @@ -14,7 +15,8 @@ class Xen_ElementConformsToProfile : CIM [Association, Description ( - "A class to associate a ManagedElement with its RegisteredProfile.") + "A class to associate a ManagedElement with its RegisteredProfile."), + Provider("cmpi::Virt_ElementConformsToProfile") ] class KVM_ElementConformsToProfile : CIM_ElementConformsToProfile { diff -r fdba4d9de966 -r d4e7585a3f53 schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementConformsToProfile.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,6 +1,6 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -#Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association -Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association -#KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association -KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfile Virt_ElementConformsToProfile association +Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile association +#KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfile Virt_ElementConformsToProfile association +KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile association diff -r fdba4d9de966 -r d4e7585a3f53 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Thu Dec 20 21:30:19 2007 +0100 +++ b/src/Virt_ElementConformsToProfile.c Thu Dec 20 21:30:19 2007 +0100 @@ -244,7 +244,11 @@ struct std_assoc *assoc_handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_ElementConformsToProfileProvider, _BROKER, libvirt_cim_init(), assoc_handlers); +STDA_AssocMIStub(, + Virt_ElementConformsToProfile, + _BROKER, + libvirt_cim_init(), + assoc_handlers); /* * Local Variables: * mode: C

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 11 of 29] ElementSettingData: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182620 -3600 # Node ID 1ca174e0f16ec42e34ba605c5108d0e484072265 # Parent d4e7585a3f53a347b655f74ff9948d2cec5e6aa0 ElementSettingData: OpenWbem support - rename provider from ElementSettingDataProvider to ElementSettingData - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r d4e7585a3f53 -r 1ca174e0f16e schema/ElementSettingData.mof --- a/schema/ElementSettingData.mof Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementSettingData.mof Thu Dec 20 21:30:20 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_ElementSettingData") +] class Xen_ElementSettingData : CIM_ElementSettingData { }; -[Association] +[Association, + Provider("cmpi::Virt_ElementSettingData") +] class KVM_ElementSettingData : CIM_ElementSettingData { }; diff -r d4e7585a3f53 -r 1ca174e0f16e schema/ElementSettingData.registration --- a/schema/ElementSettingData.registration Thu Dec 20 21:30:19 2007 +0100 +++ b/schema/ElementSettingData.registration Thu Dec 20 21:30:20 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ElementSettingData root/virt Virt_ElementSettingDataProvider Virt_ElementSettingData association -KVM_ElementSettingData root/virt Virt_ElementSettingDataProvider Virt_ElementSettingData association +Xen_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData association +KVM_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData association diff -r d4e7585a3f53 -r 1ca174e0f16e src/Virt_ElementSettingData.c --- a/src/Virt_ElementSettingData.c Thu Dec 20 21:30:19 2007 +0100 +++ b/src/Virt_ElementSettingData.c Thu Dec 20 21:30:20 2007 +0100 @@ -216,7 +216,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_ElementSettingDataProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_ElementSettingData, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 12 of 29] EnabledLogicalElementCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182620 -3600 # Node ID 740a16ad1a14660da0aa1668ae2ef36f0ab2400a # Parent 1ca174e0f16ec42e34ba605c5108d0e484072265 EnabledLogicalElementCapabilities: OpenWbem support - rename provider from EnabledLogicalElementCapabilitiesProvider to EnabledLogicalElementCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 1ca174e0f16e -r 740a16ad1a14 schema/EnabledLogicalElementCapabilities.mof --- a/schema/EnabledLogicalElementCapabilities.mof Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/EnabledLogicalElementCapabilities.mof Thu Dec 20 21:30:20 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_Capabilities to represent " - "the changes that can be made to a started Xen virtual system") + "the changes that can be made to a started Xen virtual system"), + Provider("cmpi::Virt_EnabledLogicalElementCapabilities") ] class Xen_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities { @@ -10,7 +11,8 @@ class Xen_EnabledLogicalElementCapabilit [Description ( "A class derived from CIM_Capabilities to represent " - "the changes that can be made to a started KVM virtual system") + "the changes that can be made to a started KVM virtual system"), + Provider("cmpi::Virt_EnabledLogicalElementCapabilities") ] class KVM_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities { diff -r 1ca174e0f16e -r 740a16ad1a14 schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/EnabledLogicalElementCapabilities.registration Thu Dec 20 21:30:20 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance -KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities Virt_EnabledLogicalElementCapabilities instance +KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities Virt_EnabledLogicalElementCapabilities instance diff -r 1ca174e0f16e -r 740a16ad1a14 src/Virt_EnabledLogicalElementCapabilities.c --- a/src/Virt_EnabledLogicalElementCapabilities.c Thu Dec 20 21:30:20 2007 +0100 +++ b/src/Virt_EnabledLogicalElementCapabilities.c Thu Dec 20 21:30:20 2007 +0100 @@ -234,8 +234,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_EnabledLogicalElementCapabilitiesProvider, _BROKER, - libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_EnabledLogicalElementCapabilities, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 13 of 29] HostedResourcePool: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182620 -3600 # Node ID eab9a00f1fd87ccd79ffeaabfa19a062a5ce9516 # Parent 740a16ad1a14660da0aa1668ae2ef36f0ab2400a HostedResourcePool: OpenWbem support - rename provider from HostedResourcePoolProvider to HostedResourcePoll - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 740a16ad1a14 -r eab9a00f1fd8 schema/HostedResourcePool.mof --- a/schema/HostedResourcePool.mof Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/HostedResourcePool.mof Thu Dec 20 21:30:20 2007 +0100 @@ -2,7 +2,8 @@ [Association, Description ( - "Associates a host system to its resource pools") + "Associates a host system to its resource pools"), + Provider("cmpi::Virt_HostedResourcePool") ] class Xen_HostedResourcePool : CIM_HostedResourcePool { @@ -10,7 +11,8 @@ class Xen_HostedResourcePool : CIM_Hoste [Association, Description ( - "Associates a host system to its resource pools") + "Associates a host system to its resource pools"), + Provider("cmpi::Virt_HostedResourcePool") ] class KVM_HostedResourcePool : CIM_HostedResourcePool { diff -r 740a16ad1a14 -r eab9a00f1fd8 schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/HostedResourcePool.registration Thu Dec 20 21:30:20 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association -KVM_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file +Xen_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association +KVM_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association \ No newline at end of file diff -r 740a16ad1a14 -r eab9a00f1fd8 src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Thu Dec 20 21:30:20 2007 +0100 +++ b/src/Virt_HostedResourcePool.c Thu Dec 20 21:30:20 2007 +0100 @@ -155,7 +155,11 @@ struct std_assoc *assoc_handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_HostedResourcePoolProvider, _BROKER, libvirt_cim_init(), assoc_handlers); +STDA_AssocMIStub(, + Virt_HostedResourcePool, + _BROKER, + libvirt_cim_init(), + assoc_handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 14 of 29] HostedService: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182620 -3600 # Node ID 6d1e90a790bb8f1989e1da30f093457a06d2792b # Parent eab9a00f1fd87ccd79ffeaabfa19a062a5ce9516 HostedService: OpenWbem support - rename provider from HostedServiceProvider to HostedService - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r eab9a00f1fd8 -r 6d1e90a790bb schema/HostedService.mof --- a/schema/HostedService.mof Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/HostedService.mof Thu Dec 20 21:30:20 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_HostedService") +] class Xen_HostedService : CIM_HostedService { }; -[Association] +[Association, + Provider("cmpi::Virt_HostedService") +] class KVM_HostedService : CIM_HostedService { }; diff -r eab9a00f1fd8 -r 6d1e90a790bb schema/HostedService.registration --- a/schema/HostedService.registration Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/HostedService.registration Thu Dec 20 21:30:20 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_HostedService root/virt Virt_HostedServiceProvider Virt_HostedService association -KVM_HostedService root/virt Virt_HostedServiceProvider Virt_HostedService association +Xen_HostedService root/virt Virt_HostedService Virt_HostedService association +KVM_HostedService root/virt Virt_HostedService Virt_HostedService association diff -r eab9a00f1fd8 -r 6d1e90a790bb src/Virt_HostedService.c --- a/src/Virt_HostedService.c Thu Dec 20 21:30:20 2007 +0100 +++ b/src/Virt_HostedService.c Thu Dec 20 21:30:20 2007 +0100 @@ -141,7 +141,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_HostedServiceProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_HostedService, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 15 of 29] ResourceAllocationSettingData: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182621 -3600 # Node ID 2ca0648a068045d57f1329bab6f78ecf2dff8588 # Parent 6d1e90a790bb8f1989e1da30f093457a06d2792b ResourceAllocationSettingData: OpenWbem support - rename provider from RASDProvider to RASD - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 6d1e90a790bb -r 2ca0648a0680 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/ResourceAllocationSettingData.mof Thu Dec 20 21:30:21 2007 +0100 @@ -8,7 +8,9 @@ class KVM_ResourceAllocationSettingData { }; -[Description ("Xen virtual disk configuration")] +[Description ("Xen virtual disk configuration"), + Provider("cmpi::Virt_RASD") +] class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData { @@ -17,7 +19,9 @@ class Xen_DiskResourceAllocationSettingD }; -[Description ("KVM virtual disk configuration")] +[Description ("KVM virtual disk configuration"), + Provider("cmpi::Virt_RASD") +] class KVM_DiskResourceAllocationSettingData : KVM_ResourceAllocationSettingData { @@ -26,7 +30,9 @@ class KVM_DiskResourceAllocationSettingD }; -[Description ("Xen virtual network configuration")] +[Description ("Xen virtual network configuration"), + Provider("cmpi::Virt_RASD") +] class Xen_NetResourceAllocationSettingData : Xen_ResourceAllocationSettingData { @@ -35,7 +41,9 @@ class Xen_NetResourceAllocationSettingDa }; -[Description ("KVM virtual network configuration")] +[Description ("KVM virtual network configuration"), + Provider("cmpi::Virt_RASD") +] class KVM_NetResourceAllocationSettingData : KVM_ResourceAllocationSettingData { @@ -44,22 +52,30 @@ class KVM_NetResourceAllocationSettingDa }; -[Description ("Xen virtual processor")] +[Description ("Xen virtual processor"), + Provider("cmpi::Virt_RASD") +] class Xen_ProcResourceAllocationSettingData : Xen_ResourceAllocationSettingData { }; -[Description ("KVM virtual processor")] +[Description ("KVM virtual processor"), + Provider("cmpi::Virt_RASD") +] class KVM_ProcResourceAllocationSettingData : KVM_ResourceAllocationSettingData { }; -[Description ("Xen virtual memory")] +[Description ("Xen virtual memory"), + Provider("cmpi::Virt_RASD") +] class Xen_MemResourceAllocationSettingData : Xen_ResourceAllocationSettingData { }; -[Description ("KVM virtual memory")] +[Description ("KVM virtual memory"), + Provider("cmpi::Virt_RASD") +] class KVM_MemResourceAllocationSettingData : KVM_ResourceAllocationSettingData { }; diff -r 6d1e90a790bb -r 2ca0648a0680 schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Thu Dec 20 21:30:20 2007 +0100 +++ b/schema/ResourceAllocationSettingData.registration Thu Dec 20 21:30:21 2007 +0100 @@ -1,6 +1,6 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -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 +Xen_DiskResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance +Xen_NetResourceAllocationSettingData root/virt Virt_RASDP Virt_RASD instance +Xen_ProcResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance +Xen_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance diff -r 6d1e90a790bb -r 2ca0648a0680 src/Virt_RASD.c --- a/src/Virt_RASD.c Thu Dec 20 21:30:20 2007 +0100 +++ b/src/Virt_RASD.c Thu Dec 20 21:30:21 2007 +0100 @@ -342,7 +342,10 @@ DEFAULT_INST_CLEANUP(); DEFAULT_INST_CLEANUP(); DEFAULT_EQ(); -STD_InstanceMIStub(, Virt_RASDProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_RASD, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 16 of 29] RegisteredProfile: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182621 -3600 # Node ID 7eaa38dd006eced987f5d946306a4b80ff3b3fc0 # Parent 2ca0648a068045d57f1329bab6f78ecf2dff8588 RegisteredProfile: OpenWbem support - rename provider from RegisteredProfileProvider to RegisteredProfile - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 2ca0648a0680 -r 7eaa38dd006e schema/RegisteredProfile.mof --- a/schema/RegisteredProfile.mof Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/RegisteredProfile.mof Thu Dec 20 21:30:21 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_RegisteredProfile to represent " - "an advertised conformant profile.") + "an advertised conformant profile."), + Provider("cmpi::Virt_RegisteredProfile") ] class Xen_RegisteredProfile : CIM_RegisteredProfile { @@ -10,7 +11,8 @@ class Xen_RegisteredProfile : CIM_Regist [Description ( "A class derived from CIM_RegisteredProfile to represent " - "an advertised conformant profile.") + "an advertised conformant profile."), + Provider("cmpi::Virt_RegisteredProfile") ] class KVM_RegisteredProfile : CIM_RegisteredProfile { diff -r 2ca0648a0680 -r 7eaa38dd006e schema/RegisteredProfile.registration --- a/schema/RegisteredProfile.registration Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/RegisteredProfile.registration Thu Dec 20 21:30:21 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_RegisteredProfile root/interop Virt_RegisteredProfileProvider Virt_RegisteredProfile instance -KVM_RegisteredProfile root/interop Virt_RegisteredProfileProvider Virt_RegisteredProfile instance +Xen_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile instance +KVM_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile instance diff -r 2ca0648a0680 -r 7eaa38dd006e src/Virt_RegisteredProfile.c --- a/src/Virt_RegisteredProfile.c Thu Dec 20 21:30:21 2007 +0100 +++ b/src/Virt_RegisteredProfile.c Thu Dec 20 21:30:21 2007 +0100 @@ -197,7 +197,9 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_RegisteredProfileProvider, _BROKER, +STD_InstanceMIStub(, + Virt_RegisteredProfile, + _BROKER, libvirt_cim_init()); /*

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 17 of 29] ResourceAllocationFromPool: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182621 -3600 # Node ID 1c5cfb9f21a045788eac5b090b7a64ab31d79541 # Parent 7eaa38dd006eced987f5d946306a4b80ff3b3fc0 ResourceAllocationFromPool: OpenWbem support - rename provider from ResourceAllocationFromPoolProvider to ResourceAllocationFromPool - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 7eaa38dd006e -r 1c5cfb9f21a0 schema/ResourceAllocationFromPool.mof --- a/schema/ResourceAllocationFromPool.mof Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/ResourceAllocationFromPool.mof Thu Dec 20 21:30:21 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_ResourceAllocationFromPool") +] class Xen_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool { }; -[Association] +[Association, + Provider("cmpi::Virt_ResourceAllocationFromPool") +] class KVM_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool { }; diff -r 7eaa38dd006e -r 1c5cfb9f21a0 schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/ResourceAllocationFromPool.registration Thu Dec 20 21:30:21 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association -KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file +Xen_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association +KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association \ No newline at end of file diff -r 7eaa38dd006e -r 1c5cfb9f21a0 src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Thu Dec 20 21:30:21 2007 +0100 +++ b/src/Virt_ResourceAllocationFromPool.c Thu Dec 20 21:30:21 2007 +0100 @@ -290,7 +290,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_ResourceAllocationFromPoolProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_ResourceAllocationFromPool, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 18 of 29] ResourcePoolConfigurationCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182621 -3600 # Node ID ce05dd1d69bd87665a7016daea808cad2f32588d # Parent 1c5cfb9f21a045788eac5b090b7a64ab31d79541 ResourcePoolConfigurationCapabilities: OpenWbem support - rename provider from ResourcePoolConfigurationCapabilitiesProvider to ResourcePoolConfigurationCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 1c5cfb9f21a0 -r ce05dd1d69bd schema/ResourcePoolConfigurationCapabilities.mof --- a/schema/ResourcePoolConfigurationCapabilities.mof Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationCapabilities.mof Thu Dec 20 21:30:21 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_ResourcePoolConfigurationCapabilities")] class Xen_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities { }; +[Provider("cmpi::Virt_ResourcePoolConfigurationCapabilities")] class KVM_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities { }; diff -r 1c5cfb9f21a0 -r ce05dd1d69bd schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Thu Dec 20 21:30:21 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance -KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file +Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance +KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file diff -r 1c5cfb9f21a0 -r ce05dd1d69bd src/Virt_ResourcePoolConfigurationCapabilities.c --- a/src/Virt_ResourcePoolConfigurationCapabilities.c Thu Dec 20 21:30:21 2007 +0100 +++ b/src/Virt_ResourcePoolConfigurationCapabilities.c Thu Dec 20 21:30:21 2007 +0100 @@ -118,8 +118,10 @@ static CMPIStatus GetInstance(CMPIInstan } -STD_InstanceMIStub(, Virt_ResourcePoolConfigurationCapabilitiesProvider, - _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_ResourcePoolConfigurationCapabilities, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 19 of 29] ResourcePoolConfigurationService: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182622 -3600 # Node ID 0402e7a5877b079efbb53f255da290d095d6890f # Parent ce05dd1d69bd87665a7016daea808cad2f32588d ResourcePoolConfigurationService: OpenWbem support - rename provider from ResourcePoolConfigurationServiceProvider to ResourcePoolConfigurationService - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r ce05dd1d69bd -r 0402e7a5877b schema/ResourcePoolConfigurationService.mof --- a/schema/ResourcePoolConfigurationService.mof Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationService.mof Thu Dec 20 21:30:22 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_ResourcePoolConfigurationService")] class Xen_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService { }; +[Provider("cmpi::Virt_ResourcePoolConfigurationService")] class KVM_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService { }; diff -r ce05dd1d69bd -r 0402e7a5877b schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Thu Dec 20 21:30:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationService.registration Thu Dec 20 21:30:22 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -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 +Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method +KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method \ No newline at end of file diff -r ce05dd1d69bd -r 0402e7a5877b src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Thu Dec 20 21:30:21 2007 +0100 +++ b/src/Virt_ResourcePoolConfigurationService.c Thu Dec 20 21:30:22 2007 +0100 @@ -82,8 +82,11 @@ static struct method_handler *my_handler NULL, }; -STDIM_MethodMIStub(, Virt_ResourcePoolConfigurationServiceProvider, - _BROKER, libvirt_cim_init(), my_handlers); +STDIM_MethodMIStub(, + Virt_ResourcePoolConfigurationService, + _BROKER, + libvirt_cim_init(), + my_handlers); DEFAULT_CI(); DEFAULT_MI(); @@ -205,8 +208,10 @@ static CMPIStatus EnumInstances(CMPIInst } -STD_InstanceMIStub(, Virt_ResourcePoolConfigurationServiceProvider, - _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_ResourcePoolConfigurationService, + _BROKER, + libvirt_cim_init()); /*

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 20 of 29] SettingsDefineCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182622 -3600 # Node ID 151f147d3c330d1cf2b6bf8e68e3eb5bc8a12d5c # Parent 0402e7a5877b079efbb53f255da290d095d6890f SettingsDefineCapabilities: OpenWbem support - rename provider from SettingsDefineCapabilitiesProvider to SettingsDefineCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 0402e7a5877b -r 151f147d3c33 schema/SettingsDefineCapabilities.mof --- a/schema/SettingsDefineCapabilities.mof Thu Dec 20 21:30:22 2007 +0100 +++ b/schema/SettingsDefineCapabilities.mof Thu Dec 20 21:30:22 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_SettingsDefineCapabilities") +] class Xen_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities { }; -[Association] +[Association, + Provider("cmpi::Virt_SettingsDefineCapabilities") +] class KVM_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities { }; diff -r 0402e7a5877b -r 151f147d3c33 schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Thu Dec 20 21:30:22 2007 +0100 +++ b/schema/SettingsDefineCapabilities.registration Thu Dec 20 21:30:22 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association -KVM_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +Xen_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities Virt_SettingsDefineCapabilities association +KVM_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities Virt_SettingsDefineCapabilities association diff -r 0402e7a5877b -r 151f147d3c33 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Thu Dec 20 21:30:22 2007 +0100 +++ b/src/Virt_SettingsDefineCapabilities.c Thu Dec 20 21:30:22 2007 +0100 @@ -883,7 +883,11 @@ struct std_assoc *assoc_handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_SettingsDefineCapabilitiesProvider, _BROKER, libvirt_cim_init(), assoc_handlers); +STDA_AssocMIStub(, + Virt_SettingsDefineCapabilities, + _BROKER, + libvirt_cim_init(), + assoc_handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 21 of 29] SettingsDefineState: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182622 -3600 # Node ID c37a06330fcafd3e6634a674b2fc2c7e800ee37e # Parent 151f147d3c330d1cf2b6bf8e68e3eb5bc8a12d5c SettingsDefineState: OpenWbem support - rename provider from SettingsDefineStateProvider to SettingsDefineState - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 151f147d3c33 -r c37a06330fca schema/SettingsDefineState.mof --- a/schema/SettingsDefineState.mof Thu Dec 20 21:30:22 2007 +0100 +++ b/schema/SettingsDefineState.mof Thu Dec 20 21:30:22 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_SettingsDefineState") +] class Xen_SettingsDefineState : CIM_SettingsDefineState { }; -[Association] +[Association, + Provider("cmpi::Virt_SettingsDefineState") +] class KVM_SettingsDefineState : CIM_SettingsDefineState { }; \ No newline at end of file diff -r 151f147d3c33 -r c37a06330fca schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Thu Dec 20 21:30:22 2007 +0100 +++ b/schema/SettingsDefineState.registration Thu Dec 20 21:30:22 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_SettingsDefineState root/virt Virt_SettingsDefineStateProvider Virt_SettingsDefineState association -KVM_SettingsDefineState root/virt Virt_SettingsDefineStateProvider Virt_SettingsDefineState association +Xen_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState association +KVM_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState association diff -r 151f147d3c33 -r c37a06330fca src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Thu Dec 20 21:30:22 2007 +0100 +++ b/src/Virt_SettingsDefineState.c Thu Dec 20 21:30:22 2007 +0100 @@ -392,7 +392,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_SettingsDefineStateProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_SettingsDefineState, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 22 of 29] SystemDevice: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182623 -3600 # Node ID a3524d0d678318b3a8f7bacb1ebca081b33f8976 # Parent c37a06330fcafd3e6634a674b2fc2c7e800ee37e SystemDevice: OpenWbem support - rename provider from SystemDeviceProvider to SystemDevice - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r c37a06330fca -r a3524d0d6783 schema/SystemDevice.mof --- a/schema/SystemDevice.mof Thu Dec 20 21:30:22 2007 +0100 +++ b/schema/SystemDevice.mof Thu Dec 20 21:30:23 2007 +0100 @@ -2,7 +2,8 @@ [Association, Description ( - "A class to associate a Xen_ComputerSystem with its devices." ) + "A class to associate a Xen_ComputerSystem with its devices." ), + Provider("cmpi::Virt_SystemDevice") ] class Xen_SystemDevice : CIM_SystemDevice { @@ -17,7 +18,8 @@ class Xen_SystemDevice : CIM_SystemDevic [Association, Description ( - "A class to associate a KVM_ComputerSystem with its devices." ) + "A class to associate a KVM_ComputerSystem with its devices." ), + Provider("cmpi::Virt_SystemDevice") ] class KVM_SystemDevice : CIM_SystemDevice { diff -r c37a06330fca -r a3524d0d6783 schema/SystemDevice.registration --- a/schema/SystemDevice.registration Thu Dec 20 21:30:22 2007 +0100 +++ b/schema/SystemDevice.registration Thu Dec 20 21:30:23 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_SystemDevice root/virt Virt_SystemDeviceProvider Virt_SystemDevice association -KVM_SystemDevice root/virt Virt_SystemDeviceProvider Virt_SystemDevice association +Xen_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association +KVM_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association diff -r c37a06330fca -r a3524d0d6783 src/Virt_SystemDevice.c --- a/src/Virt_SystemDevice.c Thu Dec 20 21:30:22 2007 +0100 +++ b/src/Virt_SystemDevice.c Thu Dec 20 21:30:23 2007 +0100 @@ -268,7 +268,11 @@ static struct std_assoc *assoc_handlers[ NULL }; -STDA_AssocMIStub(, Virt_SystemDeviceProvider, _BROKER, libvirt_cim_init(), assoc_handlers); +STDA_AssocMIStub(, + Virt_SystemDevice, + _BROKER, + libvirt_cim_init(), + assoc_handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 23 of 29] VirtualSystemManagementCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182623 -3600 # Node ID c308a657e5a668e4460c1ed3739066d008772b37 # Parent a3524d0d678318b3a8f7bacb1ebca081b33f8976 VirtualSystemManagementCapabilities: OpenWbem support - rename provider from VirtualSystemManagementCapabilitiesProvider to VirtualSystemManagementCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r a3524d0d6783 -r c308a657e5a6 schema/VirtualSystemManagementCapabilities.mof --- a/schema/VirtualSystemManagementCapabilities.mof Thu Dec 20 21:30:23 2007 +0100 +++ b/schema/VirtualSystemManagementCapabilities.mof Thu Dec 20 21:30:23 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_Capabilities to represent " - "the management capabilities of a Xen virtual system") + "the management capabilities of a Xen virtual system"), + Provider("cmpi::Virt_VirtualSystemManagementCapabilities") ] class Xen_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities { @@ -10,7 +11,8 @@ class Xen_VirtualSystemManagementCapabil [Description ( "A class derived from CIM_Capabilities to represent " - "the management capabilities of a KVM virtual system.") + "the management capabilities of a KVM virtual system."), + Provider("cmpi::Virt_VirtualSystemManagementCapabilities") ] class KVM_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities { diff -r a3524d0d6783 -r c308a657e5a6 schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Thu Dec 20 21:30:23 2007 +0100 +++ b/schema/VirtualSystemManagementCapabilities.registration Thu Dec 20 21:30:23 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance -KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities instance +KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities instance diff -r a3524d0d6783 -r c308a657e5a6 src/Virt_VirtualSystemManagementCapabilities.c --- a/src/Virt_VirtualSystemManagementCapabilities.c Thu Dec 20 21:30:23 2007 +0100 +++ b/src/Virt_VirtualSystemManagementCapabilities.c Thu Dec 20 21:30:23 2007 +0100 @@ -181,8 +181,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_VirtualSystemManagementCapabilitiesProvider, _BROKER, - libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_VirtualSystemManagementCapabilities, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 24 of 29] VirtualSystemManagementService: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182624 -3600 # Node ID 96a7589df350e3fc1d258f037f3cd58edab7fd5b # Parent c308a657e5a668e4460c1ed3739066d008772b37 VirtualSystemManagementService: OpenWbem support - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r c308a657e5a6 -r 96a7589df350 schema/VirtualSystemManagementService.mof --- a/schema/VirtualSystemManagementService.mof Thu Dec 20 21:30:23 2007 +0100 +++ b/schema/VirtualSystemManagementService.mof Thu Dec 20 21:30:24 2007 +0100 @@ -1,9 +1,11 @@ // Copyright IBM Corp. 2007 +[Provider("cmpi::Virt_VirtualSystemManagementService")] class Xen_VirtualSystemManagementService : CIM_VirtualSystemManagementService { }; +[Provider("cmpi::Virt_VirtualSystemManagementService")] class KVM_VirtualSystemManagementService : CIM_VirtualSystemManagementService { }; diff -r c308a657e5a6 -r 96a7589df350 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu Dec 20 21:30:23 2007 +0100 +++ b/src/Virt_VirtualSystemManagementService.c Thu Dec 20 21:30:24 2007 +0100 @@ -1246,7 +1246,9 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_VirtualSystemManagementService, _BROKER, +STD_InstanceMIStub(, + Virt_VirtualSystemManagementService, + _BROKER, libvirt_cim_init());

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 25 of 29] VirtualSystemMigrationCapabilities: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182624 -3600 # Node ID a6900f337fe25b346b2e07ec7d0357baa45f2b74 # Parent 96a7589df350e3fc1d258f037f3cd58edab7fd5b VirtualSystemMigrationCapabilities: OpenWbem support - rename provider from VSMC to VSMigrationCapabilities - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 96a7589df350 -r a6900f337fe2 schema/VSMigrationCapabilities.mof --- a/schema/VSMigrationCapabilities.mof Thu Dec 20 21:30:24 2007 +0100 +++ b/schema/VSMigrationCapabilities.mof Thu Dec 20 21:30:24 2007 +0100 @@ -10,8 +10,10 @@ class Virt_VirtualSystemMigrationCapabil }; +[Provider("cmpi::Virt_VSMigrationCapabilities")] class Xen_VirtualSystemMigrationCapabilities : Virt_VirtualSystemMigrationCapabilities { }; +[Provider("cmpi::Virt_VSMigrationCapabilities")] class KVM_VirtualSystemMigrationCapabilities : Virt_VirtualSystemMigrationCapabilities { }; diff -r 96a7589df350 -r a6900f337fe2 schema/VSMigrationCapabilities.registration --- a/schema/VSMigrationCapabilities.registration Thu Dec 20 21:30:24 2007 +0100 +++ b/schema/VSMigrationCapabilities.registration Thu Dec 20 21:30:24 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_VirtualSystemMigrationCapabilities root/virt Virt_VSMC Virt_VSMigrationCapabilities instance -KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMC Virt_VSMigrationCapabilities instance \ No newline at end of file +Xen_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance +KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance \ No newline at end of file diff -r 96a7589df350 -r a6900f337fe2 src/Virt_VSMigrationCapabilities.c --- a/src/Virt_VSMigrationCapabilities.c Thu Dec 20 21:30:24 2007 +0100 +++ b/src/Virt_VSMigrationCapabilities.c Thu Dec 20 21:30:24 2007 +0100 @@ -177,7 +177,8 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_VSMC, +STD_InstanceMIStub(, + Virt_VSMigrationCapabilities, _BROKER, libvirt_cim_init());

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 26 of 29] VirtualSystemMigrationService: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182624 -3600 # Node ID f9200a96d5da873f77f8a41a12e35c45a35225e2 # Parent a6900f337fe25b346b2e07ec7d0357baa45f2b74 VirtualSystemMigrationService: OpenWbem support - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r a6900f337fe2 -r f9200a96d5da schema/VSMigrationService.mof --- a/schema/VSMigrationService.mof Thu Dec 20 21:30:24 2007 +0100 +++ b/schema/VSMigrationService.mof Thu Dec 20 21:30:24 2007 +0100 @@ -36,9 +36,11 @@ class Virt_MigrationJob : CIM_ConcreteJo class Virt_MigrationJob : CIM_ConcreteJob { }; +[Provider("cmpi::Virt_VSMigrationService")] class Xen_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService { }; +[Provider("cmpi::Virt_VSMigrationService")] class KVM_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService { }; diff -r a6900f337fe2 -r f9200a96d5da src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Thu Dec 20 21:30:24 2007 +0100 +++ b/src/Virt_VSMigrationService.c Thu Dec 20 21:30:24 2007 +0100 @@ -751,7 +751,8 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_VSMigrationService, +STD_InstanceMIStub(, + Virt_VSMigrationService, _BROKER, libvirt_cim_init()); /*

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 27 of 29] VirtualSystemSettingData: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182625 -3600 # Node ID 339737297fb7cc37d00eaaffbdd9ed71e499f000 # Parent f9200a96d5da873f77f8a41a12e35c45a35225e2 VirtualSystemSettingData: OpenWbem support - rename provider from VSSDProvider to VSSD - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r f9200a96d5da -r 339737297fb7 schema/VSSD.mof --- a/schema/VSSD.mof Thu Dec 20 21:30:24 2007 +0100 +++ b/schema/VSSD.mof Thu Dec 20 21:30:25 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_VirtualSystemSettingData to represent " - "the config of Xen virtual machines/domains running on the system.") + "the config of Xen virtual machines/domains running on the system."), + Provider("cmpi::Virt_VSSD") ] class Xen_VirtualSystemSettingData : CIM_VirtualSystemSettingData { @@ -14,7 +15,8 @@ class Xen_VirtualSystemSettingData : CIM [Description ( "A class derived from CIM_VirtualSystemSettingData to represent " - "the config of KVM virtual machines/domains running on the system.") + "the config of KVM virtual machines/domains running on the system."), + Provider("cmpi::Virt_VSSD") ] class KVM_VirtualSystemSettingData : CIM_VirtualSystemSettingData { diff -r f9200a96d5da -r 339737297fb7 schema/VSSD.registration --- a/schema/VSSD.registration Thu Dec 20 21:30:24 2007 +0100 +++ b/schema/VSSD.registration Thu Dec 20 21:30:25 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance -KVM_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance +Xen_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance +KVM_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance diff -r f9200a96d5da -r 339737297fb7 src/Virt_VSSD.c --- a/src/Virt_VSSD.c Thu Dec 20 21:30:24 2007 +0100 +++ b/src/Virt_VSSD.c Thu Dec 20 21:30:25 2007 +0100 @@ -250,7 +250,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_VSSDProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_VSSD, + _BROKER, + libvirt_cim_init()); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 28 of 29] VirtualSystemSettingDataComponent: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182625 -3600 # Node ID 74d7f2fc36f03944c8ca54b86952dcd0e744e4ad # Parent 339737297fb7cc37d00eaaffbdd9ed71e499f000 VirtualSystemSettingDataComponent: OpenWbem support - rename provider from VSSDComponentProvider to VSSDComponent - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 339737297fb7 -r 74d7f2fc36f0 schema/VSSDComponent.mof --- a/schema/VSSDComponent.mof Thu Dec 20 21:30:25 2007 +0100 +++ b/schema/VSSDComponent.mof Thu Dec 20 21:30:25 2007 +0100 @@ -1,11 +1,15 @@ // Copyright IBM Corp. 2007 -[Association] +[Association, + Provider("cmpi::Virt_VSSDComponent") +] class Xen_VirtualSystemSettingDataComponent : CIM_Component { }; -[Association] +[Association, + Provider("cmpi::Virt_VSSDComponent") +] class KVM_VirtualSystemSettingDataComponent : CIM_Component { }; diff -r 339737297fb7 -r 74d7f2fc36f0 schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Thu Dec 20 21:30:25 2007 +0100 +++ b/schema/VSSDComponent.registration Thu Dec 20 21:30:25 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponentProvider Virt_VSSDComponent association -KVM_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponentProvider Virt_VSSDComponent association +Xen_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent association +KVM_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent association diff -r 339737297fb7 -r 74d7f2fc36f0 src/Virt_VSSDComponent.c --- a/src/Virt_VSSDComponent.c Thu Dec 20 21:30:25 2007 +0100 +++ b/src/Virt_VSSDComponent.c Thu Dec 20 21:30:25 2007 +0100 @@ -210,7 +210,11 @@ static struct std_assoc *handlers[] = { NULL }; -STDA_AssocMIStub(, Virt_VSSDComponentProvider, _BROKER, libvirt_cim_init(), handlers); +STDA_AssocMIStub(, + Virt_VSSDComponent, + _BROKER, + libvirt_cim_init(), + handlers); /* * Local Variables:

Heidi Eckhart

8:34 p.m.

New subject: [PATCH 29 of 29] ComputerSystemIndication: OpenWbem support

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1198182625 -3600 # Node ID 5ea671a0e9e9033dd8092565e434ff3a79872d84 # Parent 74d7f2fc36f03944c8ca54b86952dcd0e744e4ad ComputerSystemIndication: OpenWbem support - rename provider from ComputerSystemIndicationProvider to ComputerSystemIndication - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 74d7f2fc36f0 -r 5ea671a0e9e9 schema/ComputerSystemIndication.mof --- a/schema/ComputerSystemIndication.mof Thu Dec 20 21:30:25 2007 +0100 +++ b/schema/ComputerSystemIndication.mof Thu Dec 20 21:30:25 2007 +0100 @@ -1,21 +1,29 @@ // Copyright IBM Corp. 2007 -[Description ("Xen_ComputerSystem created")] +[Description ("Xen_ComputerSystem created"), + Provider("cmpi::Virt_ComputerSystemIndication") +] class Xen_ComputerSystemCreatedIndication : CIM_InstCreation { }; -[Description ("Xen_ComputerSystem deleted")] +[Description ("Xen_ComputerSystem deleted"), + Provider("cmpi::Virt_ComputerSystemIndication") +] class Xen_ComputerSystemDeletedIndication : CIM_InstDeletion { }; -[Description ("KVM_ComputerSystem lifecycle")] +[Description ("KVM_ComputerSystem lifecycle"), + Provider("cmpi::Virt_ComputerSystemIndication") +] class KVM_ComputerSystemCreatedIndication : CIM_InstCreation { }; -[Description ("KVM_ComputerSystem lifecycle")] +[Description ("KVM_ComputerSystem lifecycle"), + Provider("cmpi::Virt_ComputerSystemIndication") +] class KVM_ComputerSystemDeletedIndication : CIM_InstDeletion { }; diff -r 74d7f2fc36f0 -r 5ea671a0e9e9 schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Thu Dec 20 21:30:25 2007 +0100 +++ b/schema/ComputerSystemIndication.registration Thu Dec 20 21:30:25 2007 +0100 @@ -1,6 +1,6 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -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 +Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndication Virt_ComputerSystemIndication indication method +Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndication Virt_ComputerSystemIndication indication method +KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndication Virt_ComputerSystemIndication indication method +KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndication Virt_ComputerSystemIndication indication method diff -r 74d7f2fc36f0 -r 5ea671a0e9e9 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Thu Dec 20 21:30:25 2007 +0100 +++ b/src/Virt_ComputerSystemIndication.c Thu Dec 20 21:30:25 2007 +0100 @@ -303,8 +303,11 @@ DEFAULT_AF(); DEFAULT_AF(); DEFAULT_MP(); -STDI_IndicationMIStub(, Virt_ComputerSystemIndicationProvider, - _BROKER, libvirt_cim_init(), &csi); +STDI_IndicationMIStub(, + Virt_ComputerSystemIndication, + _BROKER, + libvirt_cim_init(), + &csi); /* * Local Variables:

Kaitlin Rupert

Friday, 21 December Fri, 21 Dec

12:34 a.m.

Heidi Eckhart wrote:

...

Good finds. =) +1 -- Kaitlin Rupert IBM Linux Technology Center karupert(a)us.ibm.com

6115

days inactive

6115

days old

cim@lists.libvirt.org

Manage subscription

30 comments

2 participants

tags (0)

participants (2)

Heidi Eckhart
Kaitlin Rupert

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[PATCH 00 of 29] #2 - Enable libvirt-cim providers for OpenWbem