- CIM - libvirt List Archives

[PATCH] if statement in state_change() in CS expects incorrect return value
by Kaitlin Rupert 19 Dec '07

19 Dec '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1197946011 28800 # Node ID 6f5ab2a959deeb6e13e8f684a014bec9fda36032 # Parent 8d761c7477e78302fb7dfea2ac6d82cc58974dd5 if statement in state_change() in CS expects incorrect return value. cu_get_u16_arg() returns CMPI_RC_OK upon success. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 8d761c7477e7 -r 6f5ab2a959de src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Fri Dec 14 16:13:18 2007 -0800 +++ b/src/Virt_ComputerSystem.c Mon Dec 17 18:46:51 2007 -0800 @@ -662,7 +662,7 @@ static CMPIStatus state_change(CMPIMetho const char *name = NULL; ret = cu_get_u16_arg(argsin, "RequestedState", &state); - if (!ret) { + if (ret != CMPI_RC_OK) { CMSetStatus(&s, CMPI_RC_ERR_INVALID_PARAMETER); goto out; }

2 1

[PATCH] Change method arg type in VSMS AddResourceSettings
by lizg＠cn.ibm.com 19 Dec '07

19 Dec '07

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1197944392 -28800 # Node ID 58868e43ae199187436f1709da9177e4fa0a8f3d # Parent 72b93a4339e1c13080d6a6d80a580a7742c0b851 Change method arg type in VSMS AddResourceSettings Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 72b93a4339e1 -r 58868e43ae19 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Dec 14 10:37:01 2007 +0100 +++ b/src/Virt_VirtualSystemManagementService.c Tue Dec 18 10:19:52 2007 +0800 @@ -1076,7 +1076,7 @@ static struct method_handler AddResource static struct method_handler AddResourceSettings = { .name = "AddResourceSettings", .handler = add_resource_settings, - .args = {{"AffectedConfiguration", CMPI_string}, + .args = {{"AffectedConfiguration", CMPI_ref}, {"ResourceSettings", CMPI_stringA}, ARG_END }

2 1

[PATCH 0 of 3] #2 Fix AC GetInstance() error
by Kaitlin Rupert 18 Dec '07

18 Dec '07

Update: sfcb seg faults if no instance is found but the provider returns a success. Add a fix so that if an instance isn't found, and error is returned. AC GetInstance() currently returns an error. This patchset fixes that error and also cleans up some left over functions.

1 3

[PATCH] Added installation support for openWbem
by Heidi Eckhart 18 Dec '07

18 Dec '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1197979046 -3600 # Node ID 65312624c9db0b41ec81ccb81a37274cf6901996 # Parent 7dde77938c45866d0200d647d312407118abdc1a Added installation support for openWbem Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 7dde77938c45 -r 65312624c9db base_schema/install_base_schema.sh.in --- a/base_schema/install_base_schema.sh.in Tue Dec 18 10:19:52 2007 +0800 +++ b/base_schema/install_base_schema.sh.in Tue Dec 18 12:57:26 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 7dde77938c45 -r 65312624c9db provider-register.sh --- a/provider-register.sh Tue Dec 18 10:19:52 2007 +0800 +++ b/provider-register.sh Tue Dec 18 12:57:26 2007 +0100 @@ -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

2 1

[PATCH 0 of 3] Fix AC GetInstance() error
by Kaitlin Rupert 18 Dec '07

18 Dec '07

AC GetInstance() currently returns an error. This patchset fixes that error and also cleans up some left over functions.

4 17

[PATCH 0 of 2] #4 - SDC: Fixed type of returned instance and error code
by Heidi Eckhart 18 Dec '07

18 Dec '07

Patch 1: The returned RASD instances have been of the general classname ResourceAllocationSettingData instead of the type specific one, e.g. ProcResourceAllocationSettingData Patch 2: RASD to AllocationCapabilities should return NOT_SUPPORTED instead of OK Diff to #1: patch 1: fixed missing check for unknown resource type Diff to #2: - added helper function to RASD that translates the resource type into the classname (patch 1 of 3) - updated patch 2 (#1 before) to make use of the helper function - updated patch 3 (#2 before) to make use of RETURN_UNSUPPORTED macro Diff to #3: - patch 1 and 3 are already checked in and no longer part of this patch series - added patch to harden free_rasd_prop_list() function to handle NULL pointer - patch 2 (also patch 2 before): cleaned up error handling

2 4

[PATCH 0 of 2] #5 - SDC: Fixed type of returned instance and error code
by Heidi Eckhart 18 Dec '07

18 Dec '07

Patch 1: The returned RASD instances have been of the general classname ResourceAllocationSettingData instead of the type specific one, e.g. ProcResourceAllocationSettingData Patch 2: RASD to AllocationCapabilities should return NOT_SUPPORTED instead of OK Diff to #1: patch 1: fixed missing check for unknown resource type Diff to #2: - added helper function to RASD that translates the resource type into the classname (patch 1 of 3) - updated patch 2 (#1 before) to make use of the helper function - updated patch 3 (#2 before) to make use of RETURN_UNSUPPORTED macro Diff to #3: - patch 1 and 3 are already checked in and no longer part of this patch series - added patch to harden free_rasd_prop_list() function to handle NULL pointer - patch 2 (also patch 2 before): cleaned up error handling Diff to #4: - patch 2: made inst_id a const char*

1 2

[PATCH] Change method arg type in VSMS AddResourceSettings
by lizg＠cn.ibm.com 17 Dec '07

17 Dec '07

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1197876933 -28800 # Node ID 69bfac6904d4d863ebf20c88d700496790bee9a4 # Parent 72b93a4339e1c13080d6a6d80a580a7742c0b851 Change method arg type in VSMS AddResourceSettings diff -r 72b93a4339e1 -r 69bfac6904d4 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Dec 14 10:37:01 2007 +0100 +++ b/src/Virt_VirtualSystemManagementService.c Mon Dec 17 15:35:33 2007 +0800 @@ -1076,7 +1076,7 @@ static struct method_handler AddResource static struct method_handler AddResourceSettings = { .name = "AddResourceSettings", .handler = add_resource_settings, - .args = {{"AffectedConfiguration", CMPI_string}, + .args = {{"AffectedConfiguration", CMPI_ref}, {"ResourceSettings", CMPI_stringA}, ARG_END }

3 2

[PATCH 0 of 4] #2 Fix NULL attributes returned by VSMigrationService.
by Kaitlin Rupert 17 Dec '07

17 Dec '07

Updates: Add function to Virt_HostSystem that gets the values for the Name and CreationClassName attributes of the host instance. Modify VSMgmtService so that it uses this function. Get the values for the SystemName and SystemCreationClassName from the host instance and set accordingly.

1 4

Re: [Libvirt-cim] [PATCH 1 of 2] Fix VSMigrationService NULL key attributes
by Kaitlin Rupert 17 Dec '07

17 Dec '07

Kaitlin Rupert wrote: > Dan Smith wrote: >> My plan was never to remove the placeholder, but rather to modify the >> placeholder with logic to look up and return the proper host system. >> This would give us a control point for switching between host >> instrumentation, with the option to keep our fake one if nothing else >> is available. >> Adding such a function seems like a good idea to me, and as long as it >> uses the existing internal logic in HostSystem to get the information, >> it shouldn't need to change later. >> >> Shall I hold off on this set or apply and let you add the generalized >> function first? >> >> Thanks! >> >> Yes, I'll rework this patch. No need to have the same code in multiple places if we can avoid it. =) -- Kaitlin Rupert IBM Linux Technology Center karupert(a)us.ibm.com

1 0