- CIM - libvirt List Archives

[PATCH] VSMC: use get_typed_instance function (tiny optimization)
by Heidi Eckhart 20 Feb '08

20 Feb '08

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1203420624 -3600 # Node ID d96a062a7996bee0109172f8779ae3482cfab6d5 # Parent 8b7a10c27b1cad1b140083dc5fd8b9abab2597ef VSMC: use get_typed_instance function (tiny optimization) Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 8b7a10c27b1c -r d96a062a7996 src/Virt_VirtualSystemManagementCapabilities.c --- a/src/Virt_VirtualSystemManagementCapabilities.c Tue Feb 19 12:17:08 2008 +0100 +++ b/src/Virt_VirtualSystemManagementCapabilities.c Tue Feb 19 12:30:24 2008 +0100 @@ -46,15 +46,11 @@ enum {ADD_RESOURCES = 1, static CMPIStatus set_inst_properties(const CMPIBroker *broker, - CMPIInstance *inst, - const char *classname) + CMPIInstance *inst) { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIArray *array; uint16_t element; - - CMSetProperty(inst, "CreationClassName", - (CMPIValue *)classname, CMPI_chars); CMSetProperty(inst, "InstanceID", (CMPIValue *)"ManagementCapabilities", CMPI_chars); @@ -83,13 +79,12 @@ static CMPIStatus set_inst_properties(co CMPIStatus get_vsm_cap(const CMPIBroker *broker, const CMPIObjectPath *ref, - CMPIInstance **inst, + CMPIInstance **_inst, bool is_get_inst) { - CMPIStatus s; - CMPIObjectPath *op; + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst = NULL; virConnectPtr conn = NULL; - char *classname = NULL; conn = connect_by_classname(broker, CLASSNAME(ref), &s); if (conn == NULL) { @@ -100,41 +95,26 @@ CMPIStatus get_vsm_cap(const CMPIBroker goto out; } - classname = get_typed_class(CLASSNAME(ref), - "VirtualSystemManagementCapabilities"); - if (classname == NULL) { - cu_statusf(broker, &s, + inst = get_typed_instance(_BROKER, + pfx_from_conn(conn), + "VirtualSystemManagementCapabilities", + NAMESPACE(ref)); + if (inst == NULL) + cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Invalid class"); - goto out; - } + "Can't create VirtualSystemManagementCapabilities instance"); - op = CMNewObjectPath(broker, NAMESPACE(ref), classname, &s); - if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) { - cu_statusf(broker, &s, - CMPI_RC_ERR_FAILED, - "Cannot get object path for VSMCapabilities"); - goto out; - } - - *inst = CMNewInstance(broker, op, &s); - if ((s.rc != CMPI_RC_OK) || (CMIsNullObject(*inst))) { - cu_statusf(broker, &s, - CMPI_RC_ERR_FAILED, - "Failed to instantiate HostSystem"); - goto out; - } - - s = set_inst_properties(broker, *inst, classname); + s = set_inst_properties(broker, inst); if (is_get_inst) { - s = cu_validate_ref(broker, ref, *inst); + s = cu_validate_ref(broker, ref, inst); if (s.rc != CMPI_RC_OK) goto out; } + *_inst = inst; + out: - free(classname); virConnectClose(conn); return s;

2 1

[PATCH 0 of 4] Add reference validation to VSMigrationService and VSMigrateCap.
by Kaitlin Rupert 20 Feb '08

20 Feb '08

More reference validation updates. This patch set is dependant on the get_vsm_cap() reference validation set.

3 11

[PATCH] (#3) Add Enumeration support to RASD
by Dan Smith 20 Feb '08

20 Feb '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1203439144 28800 # Node ID 95c56a7a865df18bbdf1066d8b04d5d4b75e7d44 # Parent 030c012f1698cbccc0cdd0b34f51e377ced6eb16 (#3) Add Enumeration support to RASD Supports enumerating a specific RASD type, as well as the parent classes KVM_RASD, Xen_RASD, as well as CIM_RASD. Changes: - Remove printf() in place of a CU_DEBUG() (before Kaitlin got a chance to complain, I'll have you know) - Fix silly compile error Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 030c012f1698 -r 95c56a7a865d src/Virt_RASD.c --- a/src/Virt_RASD.c Tue Feb 19 17:04:52 2008 +0800 +++ b/src/Virt_RASD.c Tue Feb 19 08:39:04 2008 -0800 @@ -34,6 +34,7 @@ #include "device_parsing.h" #include "misc_util.h" +#include "cs_util.h" #include "Virt_RASD.h" #include "svpc_types.h" @@ -442,6 +443,100 @@ CMPIrc rasd_classname_from_type(uint16_t return rc; } +static CMPIStatus _enum_rasds(const CMPIObjectPath *ref, + struct inst_list *list) +{ + virConnectPtr conn = NULL; + virDomainPtr *domains = NULL; + int count; + int i, j; + uint16_t type; + CMPIStatus s; + uint16_t types[] = {CIM_RASD_TYPE_PROC, + CIM_RASD_TYPE_DISK, + CIM_RASD_TYPE_NET, + CIM_RASD_TYPE_MEM, + 0}; + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + if (conn == NULL) + return s; + + count = get_domain_list(conn, &domains); + if (count <= 0) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get domain list"); + goto out; + } + + if (rasd_type_from_classname(CLASSNAME(ref), &type) == CMPI_RC_OK) { + types[0] = type; + types[1] = 0; + } + + for (i = 0; i < count; i++) { + for (j = 0; types[j] != 0; j++) { + CU_DEBUG("Doing RASD type %i for %s", + type, virDomainGetName(domains[i])); + rasds_for_domain(_BROKER, + virDomainGetName(domains[i]), + types[j], + ref, + list); + } + virDomainFree(domains[i]); + } + + s = (CMPIStatus){CMPI_RC_OK, NULL}; + + out: + virConnectClose(conn); + free(domains); + + return s; +} + +static CMPIStatus return_enum_rasds(const CMPIObjectPath *ref, + const CMPIResult *results, + const bool names_only) +{ + struct inst_list list; + CMPIStatus s; + + inst_list_init(&list); + + s = _enum_rasds(ref, &list); + if (s.rc == CMPI_RC_OK) { + if (names_only) + cu_return_instance_names(results, &list); + else + cu_return_instances(results, &list); + } + + inst_list_free(&list); + + return s; +} + +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return return_enum_rasds(reference, results, true); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + + return return_enum_rasds(reference, results, false); +} + static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, @@ -516,8 +611,6 @@ DEFAULT_CI(); DEFAULT_CI(); DEFAULT_MI(); DEFAULT_DI(); -DEFAULT_EI(); -DEFAULT_EIN(); DEFAULT_INST_CLEANUP(); DEFAULT_EQ();

2 1

[PATCH] Fix names_only tag in VSMC EI
by lizg＠cn.ibm.com 19 Feb '08

19 Feb '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1203411892 -28800 # Node ID 9f40e7cbae6915450613f1c1056df31ec721f692 # Parent 7b5611c03994d1568ba69560f5afad284df06bd0 Fix names_only tag in VSMC EI VirtualSystemManagementCapabilities' EI method has a 'true' names_only param. This causes sfcb fail to give a correct response. wbemcli gave me the following on the original code: wbemei http://localhost/root/virt:Xen_VirtualSystemManagementCapabilities * * wbemei: Http Exception: server returned nothing (no headers, no data) * Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 7b5611c03994 -r 9f40e7cbae69 src/Virt_VirtualSystemManagementCapabilities.c --- a/src/Virt_VirtualSystemManagementCapabilities.c Fri Feb 15 13:35:31 2008 -0800 +++ b/src/Virt_VirtualSystemManagementCapabilities.c Tue Feb 19 17:04:52 2008 +0800 @@ -175,7 +175,7 @@ static CMPIStatus EnumInstances(CMPIInst const char **properties) { - return return_vsm_cap(reference, results, true, false); + return return_vsm_cap(reference, results, false, false); } static CMPIStatus GetInstance(CMPIInstanceMI *self,

2 1

[PATCH] (#2) Add Enumeration support to RASD
by Dan Smith 19 Feb '08

19 Feb '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1203373962 28800 # Node ID c118dc77598088e3bd866df48787e5999aeb9d10 # Parent 7b5611c03994d1568ba69560f5afad284df06bd0 (#2) Add Enumeration support to RASD Supports enumerating a specific RASD type, as well as the parent classes KVM_RASD, Xen_RASD, as well as CIM_RASD. Changes: - Remove printf() in place of a CU_DEBUG() (before Kaitlin got a chance to complain, I'll have you know) Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 7b5611c03994 -r c118dc775980 src/Virt_RASD.c --- a/src/Virt_RASD.c Fri Feb 15 13:35:31 2008 -0800 +++ b/src/Virt_RASD.c Mon Feb 18 14:32:42 2008 -0800 @@ -34,6 +34,7 @@ #include "device_parsing.h" #include "misc_util.h" +#include "cs_util.h" #include "Virt_RASD.h" #include "svpc_types.h" @@ -442,6 +443,100 @@ CMPIrc rasd_classname_from_type(uint16_t return rc; } +static CMPIStatus _enum_rasds(const CMPIObjectPath *ref, + struct inst_list *list) +{ + virConnectPtr conn = NULL; + virDomainPtr *domains = NULL; + int count; + int i, j; + uint16_t type; + CMPIStatus s; + uint16_t types[] = {CIM_RASD_TYPE_PROC, + CIM_RASD_TYPE_DISK, + CIM_RASD_TYPE_NET, + CIM_RASD_TYPE_MEM, + 0}; + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + if (conn == NULL) + return s; + + count = get_domain_list(conn, &domains); + if (count <= 0) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get domain list"); + goto out; + } + + if (rasd_type_from_classname(CLASSNAME(ref), &type) == CMPI_RC_OK) { + types[0] = type; + types[1] = 0; + } + + for (i = 0; i < count; i++) { + for (j = 0; types[j] != 0; j++) { + CU_DEBUG(("Doing RASD type %i for %s", + type, virDomainGetName(domains[i])); + rasds_for_domain(_BROKER, + virDomainGetName(domains[i]), + types[j], + ref, + list); + } + virDomainFree(domains[i]); + } + + s = (CMPIStatus){CMPI_RC_OK, NULL}; + + out: + virConnectClose(conn); + free(domains); + + return s; +} + +static CMPIStatus return_enum_rasds(const CMPIObjectPath *ref, + const CMPIResult *results, + const bool names_only) +{ + struct inst_list list; + CMPIStatus s; + + inst_list_init(&list); + + s = _enum_rasds(ref, &list); + if (s.rc == CMPI_RC_OK) { + if (names_only) + cu_return_instance_names(results, &list); + else + cu_return_instances(results, &list); + } + + inst_list_free(&list); + + return s; +} + +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return return_enum_rasds(reference, results, true); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + + return return_enum_rasds(reference, results, false); +} + static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, @@ -516,8 +611,6 @@ DEFAULT_CI(); DEFAULT_CI(); DEFAULT_MI(); DEFAULT_DI(); -DEFAULT_EI(); -DEFAULT_EIN(); DEFAULT_INST_CLEANUP(); DEFAULT_EQ();

3 4

[PATCH] Add Enumeration support to RASD
by Dan Smith 19 Feb '08

19 Feb '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1203373617 28800 # Node ID 4618b355bc157e201cec22d5eeb8e265e3a84fd6 # Parent 7b5611c03994d1568ba69560f5afad284df06bd0 Add Enumeration support to RASD Supports enumerating a specific RASD type, as well as the parent classes KVM_RASD, Xen_RASD, as well as CIM_RASD. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 7b5611c03994 -r 4618b355bc15 src/Virt_RASD.c --- a/src/Virt_RASD.c Fri Feb 15 13:35:31 2008 -0800 +++ b/src/Virt_RASD.c Mon Feb 18 14:26:57 2008 -0800 @@ -34,6 +34,7 @@ #include "device_parsing.h" #include "misc_util.h" +#include "cs_util.h" #include "Virt_RASD.h" #include "svpc_types.h" @@ -442,6 +443,100 @@ CMPIrc rasd_classname_from_type(uint16_t return rc; } +static CMPIStatus _enum_rasds(const CMPIObjectPath *ref, + struct inst_list *list) +{ + virConnectPtr conn = NULL; + virDomainPtr *domains = NULL; + int count; + int i, j; + uint16_t type; + CMPIStatus s; + uint16_t types[] = {CIM_RASD_TYPE_PROC, + CIM_RASD_TYPE_DISK, + CIM_RASD_TYPE_NET, + CIM_RASD_TYPE_MEM, + 0}; + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + if (conn == NULL) + return s; + + count = get_domain_list(conn, &domains); + if (count <= 0) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get domain list"); + goto out; + } + + if (rasd_type_from_classname(CLASSNAME(ref), &type) == CMPI_RC_OK) { + types[0] = type; + types[1] = 0; + } + + for (i = 0; i < count; i++) { + for (j = 0; types[j] != 0; j++) { + printf("Doing RASD type %i for %s\n", + type, virDomainGetName(domains[i])); + rasds_for_domain(_BROKER, + virDomainGetName(domains[i]), + types[j], + ref, + list); + } + virDomainFree(domains[i]); + } + + s = (CMPIStatus){CMPI_RC_OK, NULL}; + + out: + virConnectClose(conn); + free(domains); + + return s; +} + +static CMPIStatus return_enum_rasds(const CMPIObjectPath *ref, + const CMPIResult *results, + const bool names_only) +{ + struct inst_list list; + CMPIStatus s; + + inst_list_init(&list); + + s = _enum_rasds(ref, &list); + if (s.rc == CMPI_RC_OK) { + if (names_only) + cu_return_instance_names(results, &list); + else + cu_return_instances(results, &list); + } + + inst_list_free(&list); + + return s; +} + +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return return_enum_rasds(reference, results, true); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + + return return_enum_rasds(reference, results, false); +} + static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, @@ -516,8 +611,6 @@ DEFAULT_CI(); DEFAULT_CI(); DEFAULT_MI(); DEFAULT_DI(); -DEFAULT_EI(); -DEFAULT_EIN(); DEFAULT_INST_CLEANUP(); DEFAULT_EQ();

1 0

[PATCH 0 of 2] Add VSMigrationSettingData support to SettingsDefineState
by Kaitlin Rupert 16 Feb '08

16 Feb '08

Per the VirtualSystemMigration Profile, there needs to be a SettingsDefineCapabilities association between VSMigrationCapabilities and VSMigrationSettingData.

2 8

[PATCH] Update cu_statusf() in get_vsms()
by Kaitlin Rupert 16 Feb '08

16 Feb '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1203111331 28800 # Node ID cbe6502dfe7f201fa09fd2d3d105babb1c62e573 # Parent 6792d7ab0cc36e99d95b6b8afd50fec887334007 Update cu_statusf() in get_vsms(). Use broker local to function instead of the broker belonging to the provider. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 6792d7ab0cc3 -r cbe6502dfe7f src/Virt_VSMigrationCapabilities.c --- a/src/Virt_VSMigrationCapabilities.c Fri Feb 15 09:57:43 2008 -0800 +++ b/src/Virt_VSMigrationCapabilities.c Fri Feb 15 13:35:31 2008 -0800 @@ -73,7 +73,7 @@ static CMPIStatus set_method_properties( CMSetProperty(inst, "SynchronousMethodsSupported", (CMPIValue *)&array, CMPI_uint16A); - cu_statusf(_BROKER, &s, + cu_statusf(broker, &s, CMPI_RC_OK, ""); return s; diff -r 6792d7ab0cc3 -r cbe6502dfe7f src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Fri Feb 15 09:57:43 2008 -0800 +++ b/src/Virt_VSMigrationService.c Fri Feb 15 13:35:31 2008 -0800 @@ -793,7 +793,7 @@ CMPIStatus get_migration_service(const C CMSetProperty(inst, "SystemCreationClassName", (CMPIValue *)ccname, CMPI_chars); - cu_statusf(_BROKER, &s, + cu_statusf(broker, &s, CMPI_RC_OK, ""); diff -r 6792d7ab0cc3 -r cbe6502dfe7f src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Feb 15 09:57:43 2008 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Fri Feb 15 13:35:31 2008 -0800 @@ -1235,7 +1235,7 @@ CMPIStatus get_vsms(const CMPIObjectPath goto out; } - cu_statusf(_BROKER, &s, + cu_statusf(broker, &s, CMPI_RC_OK, ""); out:

1 0

[PATCH 0 of 2] Add reference validation to get_vsm_cap().
by Kaitlin Rupert 16 Feb '08

16 Feb '08

Have get_vsm_cap() validate references. Also update providers that call get_vsm_cap().

1 2

[PATCH] (#2) This changes any uses of CMSetStatus() to cu_statusf()
by Dan Smith 16 Feb '08

16 Feb '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1203088430 28800 # Node ID 72f9d41f72aaf7d0eb06191f4170efdb9f490d9d # Parent ae2cfc5a6a853690af1fc6821b1767e383f0d24a (#2) This changes any uses of CMSetStatus() to cu_statusf() With new versions of GCC, the check for (s != NULL) in the macro sets off the "Address of `s' will always be true" warning. We don't want to turn that warning off, so this seems like the better choice Changes: - Fix broken error code Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_ComputerSystem.c Fri Feb 15 07:13:50 2008 -0800 @@ -440,7 +440,9 @@ static CMPIStatus return_enum_domains(co inst_list_init(&list); ret = enum_domains(_BROKER, conn, NAMESPACE(reference), &list); if (!ret) { - CMSetStatus(&s, CMPI_RC_ERR_FAILED); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to get domain list"); goto out; } @@ -449,8 +451,9 @@ static CMPIStatus return_enum_domains(co else cu_return_instances(results, &list); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: inst_list_free(&list); @@ -734,7 +737,9 @@ static CMPIStatus __state_change(const c else if (state == CIM_STATE_RESET) s = state_change_reset(dom, &info); else - CMSetStatus(&s, CMPI_RC_ERR_NOT_SUPPORTED); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_SUPPORTED, + "State not supported"); out: virDomainFree(dom); @@ -757,7 +762,9 @@ static CMPIStatus state_change(CMPIMetho ret = cu_get_u16_arg(argsin, "RequestedState", &state); if (ret != CMPI_RC_OK) { - CMSetStatus(&s, CMPI_RC_ERR_INVALID_PARAMETER); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Invalid RequestedState"); goto out; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_Device.c --- a/src/Virt_Device.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_Device.c Fri Feb 15 07:13:50 2008 -0800 @@ -371,7 +371,9 @@ static CMPIStatus enum_devices(const CMP inst_list_free(&list); out: - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); virConnectClose(conn); return s; diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_DevicePool.c Fri Feb 15 07:13:50 2008 -0800 @@ -795,7 +795,9 @@ static CMPIStatus return_pool(const CMPI &list); if (s.rc == CMPI_RC_OK) { __return_pool(results, &list, name_only); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_ElementAllocatedFromPool.c --- a/src/Virt_ElementAllocatedFromPool.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_ElementAllocatedFromPool.c Fri Feb 15 07:13:50 2008 -0800 @@ -102,7 +102,9 @@ static CMPIStatus vdev_to_pool(const CMP pool = get_pool_by_id(_BROKER, conn, poolid, NAMESPACE(ref)); if (pool != NULL) { inst_list_add(list, pool); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -220,8 +222,9 @@ static CMPIStatus pool_to_vdev(const CMP devs_from_pool(type, ref, poolid, list); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: return s; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_ElementCapabilities.c Fri Feb 15 07:13:50 2008 -0800 @@ -72,7 +72,9 @@ static CMPIStatus validate_caps_get_serv s = get_migration_service(ref, &_inst, _BROKER); } else - CMSetStatus(&s, CMPI_RC_ERR_NOT_FOUND); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "Not found"); *inst = _inst; out: @@ -103,7 +105,9 @@ static CMPIStatus validate_service_get_c s = get_migration_caps(ref, &_inst, _BROKER); } else - CMSetStatus(&s, CMPI_RC_ERR_NOT_FOUND); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + ""); *inst = _inst; diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_HostedDependency.c --- a/src/Virt_HostedDependency.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_HostedDependency.c Fri Feb 15 07:13:50 2008 -0800 @@ -70,14 +70,18 @@ static CMPIStatus host_to_vs(const CMPIO ret = enum_domains(_BROKER, conn, NAMESPACE(ref), list); if (ret) { - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Failed to get domain list"); } - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); return s; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_HostedResourcePool.c Fri Feb 15 07:13:50 2008 -0800 @@ -87,7 +87,9 @@ static CMPIStatus sys_to_pool(const CMPI NAMESPACE(ref), list); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); return s; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_RegisteredProfile.c --- a/src/Virt_RegisteredProfile.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_RegisteredProfile.c Fri Feb 15 07:13:50 2008 -0800 @@ -162,7 +162,9 @@ static CMPIStatus get_prof(const CMPIObj if(instance) CMReturnInstance(results, instance); else - CMSetStatus(&s, CMPI_RC_ERR_NOT_FOUND); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "Profile instance not found"); out: virConnectClose(conn); diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_ResourceAllocationFromPool.c Fri Feb 15 07:13:50 2008 -0800 @@ -112,7 +112,9 @@ static CMPIStatus rasd_to_pool(const CMP NAMESPACE(ref)); if (pool != NULL) { inst_list_add(list, pool); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -237,8 +239,9 @@ static CMPIStatus pool_to_rasd(const CMP poolid, list); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: return s; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_SettingsDefineState.c Fri Feb 15 07:13:50 2008 -0800 @@ -104,8 +104,9 @@ static CMPIStatus dev_to_rasd(const CMPI if (rasd != NULL) inst_list_add(list, rasd); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: free(name); free(devid); @@ -184,8 +185,9 @@ static CMPIStatus rasd_to_dev(const CMPI inst_list_add(list, dev); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: return s; } @@ -226,8 +228,9 @@ static CMPIStatus vs_to_vssd(const CMPIO if (vssd != NULL) inst_list_add(list, vssd); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: virDomainFree(dom); virConnectClose(conn); @@ -277,8 +280,9 @@ static CMPIStatus vssd_to_vs(const CMPIO if (cs != NULL) inst_list_add(list, cs); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: free(name); free(pfx); diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_SystemDevice.c --- a/src/Virt_SystemDevice.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_SystemDevice.c Fri Feb 15 07:13:50 2008 -0800 @@ -157,7 +157,9 @@ static CMPIStatus sys_to_dev(const CMPIO NAMESPACE(ref)); if (ret >= 0) { - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -208,7 +210,9 @@ static CMPIStatus dev_to_sys(const CMPIO "Unable to find DeviceID `%s'", devid); else { inst_list_add(list, sys); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } out: diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_VSMigrationCapabilities.c --- a/src/Virt_VSMigrationCapabilities.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_VSMigrationCapabilities.c Fri Feb 15 07:13:50 2008 -0800 @@ -73,8 +73,9 @@ static CMPIStatus set_method_properties( CMSetProperty(inst, "SynchronousMethodsSupported", (CMPIValue *)&array, CMPI_uint16A); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); return s; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_VSMigrationService.c Fri Feb 15 07:13:50 2008 -0800 @@ -114,7 +114,9 @@ static CMPIStatus check_hver(virConnectP if (remote >= local) { CU_DEBUG("Version check OK (%lu >= %lu)", remote, local); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } else { CU_DEBUG("Version check FAILED (%lu < %lu)", remote, local); cu_statusf(_BROKER, &s, @@ -123,8 +125,9 @@ static CMPIStatus check_hver(virConnectP remote, local); } - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: return s; } @@ -172,8 +175,9 @@ static CMPIStatus vs_migratable(const CM goto out; retcode = 0; - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32); @@ -432,8 +436,9 @@ static CMPIStatus migrate_vs(struct migr } CU_DEBUG("Migration succeeded"); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: free(uri); virDomainFree(dom); @@ -788,8 +793,10 @@ CMPIStatus get_migration_service(const C CMSetProperty(inst, "SystemCreationClassName", (CMPIValue *)ccname, CMPI_chars); - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); + *_inst = inst; out: diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_VSMigrationSettingData.c --- a/src/Virt_VSMigrationSettingData.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_VSMigrationSettingData.c Fri Feb 15 07:13:50 2008 -0800 @@ -47,7 +47,9 @@ static CMPIStatus set_properties(const C (CMPIValue *)&priority, CMPI_uint16); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(broker, &s, + CMPI_RC_OK, + ""); return s; } diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_VSSD.c --- a/src/Virt_VSSD.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_VSSD.c Fri Feb 15 07:13:50 2008 -0800 @@ -182,7 +182,9 @@ static CMPIStatus enum_vssd(const CMPIOb "Failed to enumerate domains"); goto out; } else if (count == 0) { - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); goto out; } @@ -200,7 +202,9 @@ static CMPIStatus enum_vssd(const CMPIOb CMReturnInstance(results, inst); } - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: free(list); @@ -271,7 +275,9 @@ static CMPIStatus GetInstance(CMPIInstan if (inst) CMReturnInstance(results, inst); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); free(locid); diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_VSSDComponent.c --- a/src/Virt_VSSDComponent.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_VSSDComponent.c Fri Feb 15 07:13:50 2008 -0800 @@ -69,8 +69,9 @@ static CMPIStatus vssd_to_rasd(const CMP list); } - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: free(name); @@ -103,8 +104,9 @@ static CMPIStatus vssd_for_name(const ch CMPI_RC_ERR_FAILED, "Error getting VSSD for `%s'", host); else - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: virDomainFree(dom); virConnectClose(conn); diff -r ae2cfc5a6a85 -r 72f9d41f72aa src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Feb 13 08:16:37 2008 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Fri Feb 15 07:13:50 2008 -0800 @@ -75,8 +75,9 @@ static CMPIStatus define_system_parse_ar goto out; } - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: return s; } @@ -373,7 +374,9 @@ static CMPIInstance *create_system(CMPII domain = calloc(1, sizeof(*domain)); if (domain == NULL) { - CMSetStatus(s, CMPI_RC_ERR_FAILED); + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Failed to allocate memory"); goto out; } @@ -492,7 +495,9 @@ static CMPIStatus destroy_system(CMPIMet rc.uint32 = IM_RC_OK; } else { rc.uint32 = IM_RC_FAILED; - CMSetStatus(&status, CMPI_RC_ERR_FAILED); + cu_statusf(_BROKER, &status, + CMPI_RC_ERR_FAILED, + "Domain already exists"); } virDomainFree(dom); trigger_indication(context, @@ -665,7 +670,9 @@ static CMPIStatus _resource_dynamic(stru if (!domain_online(dom)) { CU_DEBUG("VS `%s' not online; skipping dynamic update", dominfo->name); - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); goto out; } @@ -676,7 +683,9 @@ static CMPIStatus _resource_dynamic(stru CMPI_RC_ERR_FAILED, "Unable to change (%i) device", action); } else { - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); } out: virDomainFree(dom); @@ -769,7 +778,9 @@ static CMPIStatus resource_add(struct do list = realloc(*_list, ((*count)+1)*sizeof(struct virt_device)); if (list == NULL) { /* No memory */ - CMSetStatus(&s, CMPI_RC_ERR_FAILED); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to allocate memory"); goto out; } @@ -786,7 +797,9 @@ static CMPIStatus resource_add(struct do if (s.rc != CMPI_RC_OK) goto out; - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); (*count)++; out: @@ -1038,7 +1051,9 @@ static CMPIStatus rasd_refs_to_insts(con REF2STR(ref)); } - CMSetStatus(&s, CMPI_RC_OK); + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); *ret_arr = tmp_arr; return s; @@ -1220,8 +1235,9 @@ CMPIStatus get_vsms(const CMPIObjectPath goto out; } - CMSetStatus(&s, CMPI_RC_OK); - + cu_statusf(_BROKER, &s, + CMPI_RC_OK, + ""); out: virConnectClose(conn); *_inst = inst;

2 1