- CIM - libvirt List Archives

[PATCH] Remove newline characters from CU_DEBUG calls now that the newline is automatic. Also remove a few debug messages that are no longer necessary and clutter output
by Jay Gagnon 05 Nov '07

05 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1193939694 14400 # Node ID 66e4bd0fd892e97719769b5ad3128ed2ccbfc514 # Parent 308064b52d99dcfff6315a309cc8aa66cb55f556 Remove newline characters from CU_DEBUG calls now that the newline is automatic. Also remove a few debug messages that are no longer necessary and clutter output. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 308064b52d99 -r 66e4bd0fd892 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Thu Nov 01 13:48:50 2007 -0400 +++ b/src/Virt_SettingsDefineCapabilities.c Thu Nov 01 13:54:54 2007 -0400 @@ -51,12 +51,10 @@ static bool rasd_prop_copy_value(struct { bool rc = true; - CU_DEBUG("Copying '%s'.\n", src.field); + CU_DEBUG("Copying '%s'.", src.field); if (src.type & CMPI_string) { - CU_DEBUG("String type.\n"); dest->value = (CMPIValue *)strdup((char *)src.value); } else if (src.type & CMPI_INTEGER) { - CU_DEBUG("Integer type.\n"); dest->value = malloc(sizeof(CMPIValue)); memcpy(dest->value, src.value, sizeof(CMPIValue)); } else { @@ -74,7 +72,6 @@ static bool dup_rasd_prop_list(struct sd *dest = NULL; for (i = 0, count = 1; src[i].field != NULL; i++, count++) { - CU_DEBUG("count: %d, i: %d. reallocing.\n", count, i); *dest = realloc(*dest, count * sizeof(struct sdc_rasd_prop)); (*dest)[i].field = strdup(src[i].field); ret = rasd_prop_copy_value(src[i], &(*dest)[i]); @@ -82,7 +79,6 @@ static bool dup_rasd_prop_list(struct sd } /* Make sure to terminate the list. */ - CU_DEBUG("Terminating list. count: %d, i: %d\n", count, i); *dest = realloc(*dest, count * sizeof(struct sdc_rasd_prop)); (*dest)[i] = (struct sdc_rasd_prop)PROP_END; @@ -386,16 +382,16 @@ static CMPIInstance *sdc_rasd_inst(const CMSetProperty(inst, "ResourceType", &resource_type, CMPI_uint16); for (i = 0; prop_list[i].field != NULL; i++) { - CU_DEBUG("Setting property '%s'.\n", prop_list[i].field); + CU_DEBUG("Setting property '%s'.", prop_list[i].field); CMSetProperty(inst, prop_list[i].field, prop_list[i].value, prop_list[i].type); - CU_DEBUG("Set.\n"); - } - - CU_DEBUG("freeing prop_list.\n"); + CU_DEBUG("Set."); + } + + CU_DEBUG("freeing prop_list."); free_rasd_prop_list(prop_list); out: - CU_DEBUG("Returning inst.\n"); + CU_DEBUG("Returning inst."); return inst; } @@ -422,17 +418,17 @@ static CMPIStatus sdc_rasds_for_type(con CU_DEBUG("Problem getting inst."); goto out; } - CU_DEBUG("Got inst.\n"); + CU_DEBUG("Got inst."); if (inst != NULL) { inst_list_add(list, inst); - CU_DEBUG("Added inst.\n"); + CU_DEBUG("Added inst."); } else { - CU_DEBUG("Inst is null, not added.\n"); + CU_DEBUG("Inst is null, not added."); } } } else { - CU_DEBUG("Unsupported type.\n"); + CU_DEBUG("Unsupported type."); CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, "Unsupported device type."); } @@ -449,7 +445,7 @@ static CMPIStatus alloc_cap_to_rasd(cons int ret; uint16_t type; - CU_DEBUG("Getting ResourceType.\n"); + CU_DEBUG("Getting ResourceType."); ret = cu_get_u16_path(ref, "ResourceType", &type); if (ret != 1) { @@ -458,7 +454,7 @@ static CMPIStatus alloc_cap_to_rasd(cons goto out; } - CU_DEBUG("ResourceType: %hi.\n", type); + CU_DEBUG("ResourceType: %hi.", type); s = sdc_rasds_for_type(ref, list, type);

2 5

[PATCH] Remove newline characters from CU_DEBUG calls now that the newline is automatic. Also remove a few debug messages that are no longer necessary and clutter output
by Jay Gagnon 05 Nov '07

05 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1194274337 18000 # Node ID 81dadd293027c2b7f5448f81847966a467acca46 # Parent c085e6e20b40d6dd3cde7809b2681be53f6b4dea Remove newline characters from CU_DEBUG calls now that the newline is automatic. Also remove a few debug messages that are no longer necessary and clutter output. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r c085e6e20b40 -r 81dadd293027 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Mon Nov 05 09:23:11 2007 -0500 +++ b/src/Virt_SettingsDefineCapabilities.c Mon Nov 05 09:52:17 2007 -0500 @@ -53,12 +53,10 @@ static bool rasd_prop_copy_value(struct { bool rc = true; - CU_DEBUG("Copying '%s'.\n", src.field); + CU_DEBUG("Copying '%s'.", src.field); if (src.type & CMPI_string) { - CU_DEBUG("String type.\n"); dest->value = (CMPIValue *)strdup((char *)src.value); } else if (src.type & CMPI_INTEGER) { - CU_DEBUG("Integer type.\n"); dest->value = malloc(sizeof(CMPIValue)); memcpy(dest->value, src.value, sizeof(CMPIValue)); } else { @@ -76,7 +74,6 @@ static bool dup_rasd_prop_list(struct sd *dest = NULL; for (i = 0, count = 1; src[i].field != NULL; i++, count++) { - CU_DEBUG("count: %d, i: %d. reallocing.\n", count, i); *dest = realloc(*dest, count * sizeof(struct sdc_rasd_prop)); (*dest)[i].field = strdup(src[i].field); ret = rasd_prop_copy_value(src[i], &(*dest)[i]); @@ -84,7 +81,6 @@ static bool dup_rasd_prop_list(struct sd } /* Make sure to terminate the list. */ - CU_DEBUG("Terminating list. count: %d, i: %d\n", count, i); *dest = realloc(*dest, count * sizeof(struct sdc_rasd_prop)); (*dest)[i] = (struct sdc_rasd_prop)PROP_END; @@ -501,16 +497,16 @@ static CMPIInstance *sdc_rasd_inst(const CMSetProperty(inst, "ResourceType", &resource_type, CMPI_uint16); for (i = 0; prop_list[i].field != NULL; i++) { - CU_DEBUG("Setting property '%s'.\n", prop_list[i].field); + CU_DEBUG("Setting property '%s'.", prop_list[i].field); CMSetProperty(inst, prop_list[i].field, prop_list[i].value, prop_list[i].type); - CU_DEBUG("Set.\n"); - } - - CU_DEBUG("freeing prop_list.\n"); + CU_DEBUG("Set."); + } + + CU_DEBUG("freeing prop_list."); free_rasd_prop_list(prop_list); out: - CU_DEBUG("Returning inst.\n"); + CU_DEBUG("Returning inst."); return inst; } @@ -537,17 +533,17 @@ static CMPIStatus sdc_rasds_for_type(con CU_DEBUG("Problem getting inst."); goto out; } - CU_DEBUG("Got inst.\n"); + CU_DEBUG("Got inst."); if (inst != NULL) { inst_list_add(list, inst); - CU_DEBUG("Added inst.\n"); + CU_DEBUG("Added inst."); } else { - CU_DEBUG("Inst is null, not added.\n"); + CU_DEBUG("Inst is null, not added."); } } } else { - CU_DEBUG("Unsupported type.\n"); + CU_DEBUG("Unsupported type."); CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, "Unsupported device type."); } @@ -564,7 +560,7 @@ static CMPIStatus alloc_cap_to_rasd(cons int ret; uint16_t type; - CU_DEBUG("Getting ResourceType.\n"); + CU_DEBUG("Getting ResourceType."); ret = cu_get_u16_path(ref, "ResourceType", &type); if (ret != 1) { @@ -573,7 +569,7 @@ static CMPIStatus alloc_cap_to_rasd(cons goto out; } - CU_DEBUG("ResourceType: %hi.\n", type); + CU_DEBUG("ResourceType: %hi.", type); s = sdc_rasds_for_type(ref, list, type);

1 0

[PATCH] fix trivial libcmpiutil compilation issue
by Daniel Veillard 05 Nov '07

05 Nov '07

# HG changeset patch # User Daniel Veillard <veillard(a)redhat.com> # Date 1193910954 -3600 # Node ID 5e54246e74833caed8f5176f8bd5bb9e28b60299 # Parent 05b01d03f0b801afe266d8d012bc464be6a2d165 Fix a trivial compilation problem, the variable declaration is at the wrong place. Signed-off-by: Daniel Veillard <veillard(a)redhat.com> Daniel diff -r 05b01d03f0b8 -r 5e54246e7483 eo_parser.c --- a/eo_parser.c Sun Feb 15 22:01:53 2015 -0800 +++ b/eo_parser.c Thu Nov 01 10:55:54 2007 +0100 @@ -66,9 +66,9 @@ int cu_parse_embedded_instance(const cha const CMPIBroker *broker, CMPIInstance **instance) { + int ret; #ifdef HAVE_EOPARSER int fd; - int ret; FILE *fp; fd = write_temp(eo); -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 2

Automatic information of updates to libvirt-cim and libcmpiutil
by Heidi Eckhart 05 Nov '07

05 Nov '07

Is there an automated process that informs the list each time an update was made to the libvirt.org/hg/libvirt-cim and libvirt.org/hg/libcmpiutil repositories. If not already there, this would be great to have. thanks ... Heidi -- Regards Heidi Eckhart Software Engineer Linux Technology Center - Open Hypervisor heidieck(a)linux.vnet.ibm.com ************************************************** IBM Deutschland Entwicklung GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschaeftsfuehrung: Herbert Kircher Sitz der Gesellschaft: Boeblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

4 6

[PATCH 0 of 2] Move two classes to cu_compare_ref()
by Dan Smith 02 Nov '07

02 Nov '07

The first patch removes the internal reference key checking from VSMS in favor of the libcmpiutil generic one. The second makes ComputerSystem do similar checking. If this looks good to people, we'll want to do this for (probably) all of the instance providers.

2 3

[PATCH] Fix enum_domains() to generate a correct ObjectPath for returned Instances
by Dan Smith 02 Nov '07

02 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194024510 25200 # Node ID d48584b1c90c499dea3940c1718ef0e97ae5ef9e # Parent 854d848bae0b56420e483ac7522775b6b3080aaa Fix enum_domains() to generate a correct ObjectPath for returned Instances This fixes the fact that HostedDependency is returning ComputerSystem instances with the wrong class name. - Modified enum_domains() to take a namespace instead of an object path and actually create the correct OP for the instances - Removed an unnecessary parameter from instance_from_dom() Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 854d848bae0b -r d48584b1c90c src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Fri Nov 02 07:03:04 2007 -0700 +++ b/src/Virt_ComputerSystem.c Fri Nov 02 10:28:30 2007 -0700 @@ -239,8 +239,7 @@ static int set_creation_class(CMPIInstan /* Populate an instance with information from a domain */ static int instance_from_dom(const CMPIBroker *broker, virDomainPtr dom, - CMPIInstance *instance, - const CMPIObjectPath *reference) + CMPIInstance *instance) { if (!set_name_from_dom(dom, instance)) { /* Print trace error */ @@ -291,7 +290,7 @@ CMPIInstance *instance_from_name(const C if (instance == NULL) goto out; - if (!instance_from_dom(broker, dom, instance, op)) + if (!instance_from_dom(broker, dom, instance)) instance = NULL; out: @@ -303,7 +302,7 @@ CMPIInstance *instance_from_name(const C /* Enumerate domains on the given connection, return results */ int enum_domains(const CMPIBroker *broker, virConnectPtr conn, - const CMPIObjectPath *op, + const char *ns, struct inst_list *instlist) { virDomainPtr *list = NULL; @@ -315,14 +314,13 @@ int enum_domains(const CMPIBroker *broke goto out; for (i = 0; i < count; i++) { - CMPIStatus s; CMPIInstance *inst; - inst = CMNewInstance(broker, op, &s); - if ((s.rc != CMPI_RC_OK) || (CMIsNullObject(inst))) + inst = get_typed_instance(broker, "ComputerSystem", ns); + if (inst == NULL) goto end; - if (instance_from_dom(broker, list[i], inst, op)) + if (instance_from_dom(broker, list[i], inst)) inst_list_add(instlist, inst); end: @@ -351,7 +349,7 @@ static CMPIStatus return_enum_domains(co return s; inst_list_init(&list); - ret = enum_domains(_BROKER, conn, reference, &list); + ret = enum_domains(_BROKER, conn, NAMESPACE(reference), &list); if (!ret) { CMSetStatus(&s, CMPI_RC_ERR_FAILED); goto out; diff -r 854d848bae0b -r d48584b1c90c src/Virt_ComputerSystem.h --- a/src/Virt_ComputerSystem.h Fri Nov 02 07:03:04 2007 -0700 +++ b/src/Virt_ComputerSystem.h Fri Nov 02 10:28:30 2007 -0700 @@ -49,7 +49,7 @@ CMPIInstance *instance_from_name(const C */ int enum_domains(const CMPIBroker *broker, virConnectPtr conn, - const CMPIObjectPath *op, + const char *ns, struct inst_list *instlist); diff -r 854d848bae0b -r d48584b1c90c src/Virt_HostedDependency.c --- a/src/Virt_HostedDependency.c Fri Nov 02 07:03:04 2007 -0700 +++ b/src/Virt_HostedDependency.c Fri Nov 02 10:28:30 2007 -0700 @@ -62,7 +62,7 @@ static CMPIStatus host_to_vs(const CMPIO if (conn == NULL) return s; - ret = enum_domains(_BROKER, conn, ref, list); + ret = enum_domains(_BROKER, conn, NAMESPACE(ref), list); if (ret) { CMSetStatus(&s, CMPI_RC_OK); } else {

2 1

[PATCH] Fix externally-visible name of type_from_classname()
by Dan Smith 02 Nov '07

02 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1424173382 28800 # Node ID f922cb6a051d0d4bf0186bb755627e5df981997f # Parent e385d591fa6f8bbe135434117a16039d5693f5b4 Fix externally-visible name of type_from_classname() Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r e385d591fa6f -r f922cb6a051d src/Virt_Device.c --- a/src/Virt_Device.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_Device.c Tue Feb 17 03:43:02 2015 -0800 @@ -247,7 +247,7 @@ static CMPIInstance *device_instance(con return instance; } -int type_from_classname(const char *classname) +int device_type_from_classname(const char *classname) { if (strstr(classname, "NetworkPort")) return VIRT_DEV_NET; @@ -321,7 +321,7 @@ static int dom_list_devices(virConnectPt int i; int type; - type = type_from_classname(CLASSNAME(ref)); + type = device_type_from_classname(CLASSNAME(ref)); ndom = get_domain_list(conn, &doms); if (ndom == 0) @@ -458,8 +458,11 @@ static CMPIStatus get_device(const CMPIO CMPIStatus s; virConnectPtr conn; CMPIInstance *inst; + const char *cn; - conn = connect_by_classname(_BROKER, CLASSNAME(reference), &s); + cn = CLASSNAME(reference); + + conn = connect_by_classname(_BROKER, cn, &s); if (!conn) return s; @@ -467,7 +470,7 @@ static CMPIStatus get_device(const CMPIO conn, devid, NAMESPACE(reference), - type_from_classname(CLASSNAME(reference))); + device_type_from_classname(cn)); if (inst) { CMReturnInstance(results, inst); CMSetStatus(&s, CMPI_RC_OK); diff -r e385d591fa6f -r f922cb6a051d src/Virt_Device.h --- a/src/Virt_Device.h Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_Device.h Tue Feb 17 03:43:02 2015 -0800 @@ -56,7 +56,7 @@ CMPIInstance *instance_from_devid(const const char *ns, int type); -int type_from_classname(const char *classname); +int device_type_from_classname(const char *classname); #endif diff -r e385d591fa6f -r f922cb6a051d src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_SettingsDefineState.c Tue Feb 17 03:43:02 2015 -0800 @@ -148,7 +148,7 @@ static CMPIInstance *_get_typed_device(c conn, id, ns, - type_from_classname(typestr)); + device_type_from_classname(typestr)); out: virConnectClose(conn); diff -r e385d591fa6f -r f922cb6a051d src/Virt_SystemDevice.c --- a/src/Virt_SystemDevice.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_SystemDevice.c Tue Feb 17 03:43:02 2015 -0800 @@ -171,7 +171,7 @@ static CMPIStatus sys_to_dev(const CMPIO if (info->result_class) { int type; - type = type_from_classname(info->result_class); + type = device_type_from_classname(info->result_class); ret = get_dom_devices(host, list, type, NAMESPACE(ref)); } else {

2 2

[PATCH] Consolidation of ResourceAllocationSettingData
by Heidi Eckhart 02 Nov '07

02 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1193994073 -3600 # Node ID 233f09c15c1194a9814cb339f5cd70b5b1e27932 # Parent d0a5fd9a1b73ed456ee179ce54b51d57fad1adeb Consolidation of ResourceAllocationSettingData Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r d0a5fd9a1b73 -r 233f09c15c11 Makefile.am --- a/Makefile.am Thu Nov 01 12:15:08 2007 +0100 +++ b/Makefile.am Fri Nov 02 10:01:13 2007 +0100 @@ -71,12 +71,8 @@ INTEROP_REGS = \ schema/RegisteredProfile.registration \ schema/ElementConformsToProfile.registration -EXTRA_BASE_MOFS = \ - schema/Xen_ResourceAllocationSettingData.mof \ - schema/KVM_ResourceAllocationSettingData.mof - pkgdata_DATA = $(MOFS) $(REGS) -pkgdata_SCRIPTS = provider-register.sh register_base.sh +pkgdata_SCRIPTS = provider-register.sh EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) \ libvirt-cim.spec.in libvirt-cim.spec \ @@ -85,7 +81,6 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pk # Un/Register the providers and class definitions from/to the current CIMOM. # @CIMSERVER@ is set by the configure script postinstall: - sh register_base.sh @CIMSERVER@ $(EXTRA_BASE_MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) diff -r d0a5fd9a1b73 -r 233f09c15c11 register_base.sh --- a/register_base.sh Thu Nov 01 12:15:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -#!/bin/bash -# -# A script to register base classes with the CIMOM -# -# Copyright IBM Corp. 2007 -# Author: Dan Smith <danms(a)us.ibm.com> -# -# Usage: -# -# $ register_base.sh (sfcb|pegasus) [MOF...] -# -# FIXME: Need to make pegasus location and namespace variable - -CIMOM=$1 - -if [ -z "$CIMOM" ]; then - echo "Usage: $0 (pegasus|sfcb)" - exit 1 -fi - -shift - -if [ "$CIMOM" = "pegasus" ]; then - for i in $*; do - cimmofl -W -uc -aEV -R/var/lib/Pegasus -n /root/ibmsd $i - done -elif [ "$CIMOM" = "sfcb" ]; then - for i in $*; do - sfcbstage -n /root/ibmsd $i - done -else - echo "Unknown CIMOM type: $CIMOM" -fi diff -r d0a5fd9a1b73 -r 233f09c15c11 schema/KVM_ResourceAllocationSettingData.mof --- a/schema/KVM_ResourceAllocationSettingData.mof Thu Nov 01 12:15:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -// Copyright IBM Corp. 2007 -class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - -}; diff -r d0a5fd9a1b73 -r 233f09c15c11 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Thu Nov 01 12:15:08 2007 +0100 +++ b/schema/ResourceAllocationSettingData.mof Fri Nov 02 10:01:13 2007 +0100 @@ -1,4 +1,12 @@ // Copyright IBM Corp. 2007 +class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { + +}; + +class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { + +}; + [Description ("Xen virtual disk configuration")] class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData{ diff -r d0a5fd9a1b73 -r 233f09c15c11 schema/Xen_ResourceAllocationSettingData.mof --- a/schema/Xen_ResourceAllocationSettingData.mof Thu Nov 01 12:15:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -// Copyright IBM Corp. 2007 -class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - -};

2 2

[PATCH] Fix incorrect use of InstanceID instead of DeviceID in SDS
by Dan Smith 02 Nov '07

02 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1424173566 28800 # Node ID e1cc2a3bbeffbb0b6ec390c68a0b0cb3d39a6f22 # Parent a292dd2d0e1fc7e0e5d7d85afe67aae5fa7fa6ed Fix incorrect use of InstanceID instead of DeviceID in SDS Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r a292dd2d0e1f -r e1cc2a3bbeff src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Feb 17 03:44:43 2015 -0800 +++ b/src/Virt_SettingsDefineState.c Tue Feb 17 03:46:06 2015 -0800 @@ -80,11 +80,11 @@ static CMPIStatus dev_to_rasd(const CMPI inst_list_init(&rasds); - id = cu_get_str_path(ref, "InstanceID"); + id = cu_get_str_path(ref, "DeviceID"); if (id == NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Missing InstanceID"); + "Missing DeviceID"); goto out; } @@ -92,7 +92,7 @@ static CMPIStatus dev_to_rasd(const CMPI if (!ret) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Invalid InstanceID"); + "Invalid DeviceID"); goto out; }

2 1

[PATCH] Update SettingsDefineState for disks
by Dan Smith 02 Nov '07

02 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1424173483 28800 # Node ID a292dd2d0e1fc7e0e5d7d85afe67aae5fa7fa6ed # Parent f922cb6a051d0d4bf0186bb755627e5df981997f Update SettingsDefineState for disks Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f922cb6a051d -r a292dd2d0e1f src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Feb 17 03:43:02 2015 -0800 +++ b/src/Virt_SettingsDefineState.c Tue Feb 17 03:44:43 2015 -0800 @@ -98,7 +98,7 @@ static CMPIStatus dev_to_rasd(const CMPI ret = rasds_for_domain(_BROKER, name, - CIM_RASD_TYPE_DISK, + device_type_from_classname(CLASSNAME(ref)), NAMESPACE(ref), &rasds);

2 1