- CIM - libvirt List Archives

Best practices for patchsets
by Jay Gagnon 28 Nov '07

28 Nov '07

Lately we've been having more groups of patches than single patches, which I believe to be a good thing because it also means we've been getting less 500 line patches entitled "Fix everything." :) However, it's also increasing our opportunity for confusion, as we have more opportunity for patchset fragmentation. I have a couple of suggestions for how we should handle patchsets, along with a few things that have been floating around my head for a while about patches in general, so I'm laying them out here. I'd like to know what everybody thinks, and eventually get the final version somewhere on the website as well. Patches in general: 1. When you add a patch to the queue you have an idea of where you're going with it, and the commit message should reflect that. Be specific. We have a tendency to say something like "Various fixes to AllocationCapabilities" (I'm a huge offender here), when we really should be saying what was actually fixed, like "add EnumInstances support" or "eliminate duplicate instances." 2. Stay on task with a patch. If you notice other problems while you are working on patch, and they are not most definitely specific to your patch, they should be another patch. 3. This will sound a lot like "Stay on task," but resist the temptation to nitpick with a patch. I have a peculiar desire to have all declares at the beginning of the function, sorted according to length in ascending order. We all have our own idea on how best to name a variable or format a function call. Often, the change is in fact worthwhile, and is welcome, but lots of little changes that don't directly relate to a fix can really make that patch hard to read. They should be another patch. 4. Before you type, "hg email," you should always type, "hg export," first. Review your patch. Does it have any typos in the comments? Did you accidentally include an irrelevant change? Is your commit message still accurate and useful? Patchsets: 1. When you send a group of patches, Mercurial's email extension will create a "header" email. Make the subject and body of that email meaningful, so we know how the patches relate. It's easy to say, "Each patch has a commit message, it's obvious how they work together," but the rest of the list usually won't agree with that. If the commit messages for each patch are good, you shouldn't need more than a sentence or two to tie them all together, but you do need it. 2. If any of your patches are rejected and you rework them, resend the entire set. This prevents things like, "So use patch 1 of 4 from the set I sent yesterday, 2 and 3 of 4 from the patch I sent an hour later, and patch 4 of 4 from today." 3. If you resend a patchset, and the "Patch [0 of 3]" subject line was, "AllocationCapabilities fix," then the new subject line should be, "AllocationCapabilities fix, version 2." This will make it easier for email clients to thread things correctly, and for human readers to know they are looking at the most current revision of your set. I think that's everything for now. Additions, comments, suggestions are welcome. -- -Jay

4 11

[PATCH 0 of 2] Fix problem with EnabledLogicalElementCapabilities EnumInstances.
by Kaitlin Rupert 28 Nov '07

28 Nov '07

This set of patches fixes the problem where ein/ei on EnabledLogicalElementCapabilities returns a "Missing key: Name" error.

3 5

[PATCH 0 of 3] Reworked - Fixes to RegisteredProfile and ECTP depending on connect_by_classname approach.
by Heidi Eckhart 28 Nov '07

28 Nov '07

4 10

[PATCH] Convert CMSetStatusWithChars calls to cu_statusf, clean up
by Jay Gagnon 27 Nov '07

27 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1196197789 18000 # Node ID d798c4c8a940eeb6d24cdb89eb0bf7141c928e19 # Parent c1c0c6a064474701ec5e743d32819f179553c540 Convert CMSetStatusWithChars calls to cu_statusf, clean up. We use cu_statusf everywhere already, the minimum call syntax is the same (plus printf style formatting for free) and the name is about sixty characters shorter. Also make sure the calls are formatted correctly. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r c1c0c6a06447 -r d798c4c8a940 libxkutil/misc_util.c --- a/libxkutil/misc_util.c Mon Nov 26 10:32:08 2007 -0800 +++ b/libxkutil/misc_util.c Tue Nov 27 16:09:49 2007 -0500 @@ -60,9 +60,9 @@ virConnectPtr connect_by_classname(const uri = cn_to_uri(classname); if (!uri) { - CMSetStatusWithChars(broker, s, - CMPI_RC_ERR_FAILED, - "Unable to generate URI from classname"); + cu_statusf(broker, s, + CMPI_RC_ERR_FAILED, + "Unable to generate URI from classname"); return NULL; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_AllocationCapabilities.c Tue Nov 27 16:09:49 2007 -0500 @@ -51,15 +51,17 @@ CMPIStatus get_alloc_cap(const CMPIBroke NAMESPACE(ref)); if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { - CMSetStatusWithChars(broker, &s, CMPI_RC_ERR_FAILED, - "Could not get ResourceType."); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get ResourceType."); goto out; } ret = asprintf(&inst_id, "%hi/%s", type, "0"); if (ret == -1) { - CMSetStatusWithChars(broker, &s, CMPI_RC_ERR_FAILED, - "Could not get InstanceID."); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get InstanceID."); goto out; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_ComputerSystem.c Tue Nov 27 16:09:49 2007 -0500 @@ -446,9 +446,9 @@ static CMPIStatus GetInstance(CMPIInstan if (name == NULL) { CMPIStatus s; - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "No domain name specified"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No domain name specified"); return s; } @@ -492,15 +492,15 @@ static CMPIStatus state_change_enable(vi break; default: printf("Cannot go to enabled state from %i\n", info->state); - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Invalid state transition"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Invalid state transition"); }; if (ret != 0) - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain Operation Failed"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain Operation Failed"); return s; } @@ -517,15 +517,15 @@ static CMPIStatus state_change_disable(v break; default: printf("Cannot go to disabled state from %i\n", info->state); - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Invalid state transition"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Invalid state transition"); }; if (ret != 0) - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain Operation Failed"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain Operation Failed"); return s; } @@ -541,15 +541,15 @@ static CMPIStatus state_change_pause(vir ret = virDomainSuspend(dom); break; default: - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain not running"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain not running"); }; if (ret != 0) - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain Operation Failed"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain Operation Failed"); return s; } @@ -565,15 +565,15 @@ static CMPIStatus state_change_reboot(vi ret = virDomainReboot(dom, 0); break; default: - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain not running"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain not running"); }; if (ret != 0) - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain Operation Failed"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain Operation Failed"); return s; } @@ -589,15 +589,15 @@ static CMPIStatus state_change_reset(vir ret = domain_reset(dom); break; default: - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain not running"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain not running"); }; if (ret != 0) - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain Operation Failed"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain Operation Failed"); return s; } @@ -617,16 +617,16 @@ static CMPIStatus __state_change(char *n dom = virDomainLookupByName(conn, name); if (dom == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Domain not found"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Domain not found"); goto out; } if (virDomainGetInfo(dom, &info) != 0) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Unable to get current state"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get current state"); goto out; } @@ -670,9 +670,9 @@ static CMPIStatus state_change(CMPIMetho name = cu_get_str_path(reference, "Name"); if (name == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Name key not specified"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Name key not specified"); goto out; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_Device.c --- a/src/Virt_Device.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_Device.c Tue Nov 27 16:09:49 2007 -0500 @@ -371,9 +371,9 @@ static CMPIStatus enum_devices(const CMP return s; if (!dom_list_devices(conn, reference, &list)) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Failed to list domains"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to list domains"); return s; } @@ -492,9 +492,9 @@ static CMPIStatus get_device(const CMPIO CMReturnInstance(results, inst); CMSetStatus(&s, CMPI_RC_OK); } else { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Unable to get device instance"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get device instance"); } virConnectClose(conn); @@ -531,9 +531,9 @@ static CMPIStatus GetInstance(CMPIInstan if (devid == NULL) { CMPIStatus s; - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "No DeviceID specified"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No DeviceID specified"); return s; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_ElementCapabilities.c Tue Nov 27 16:09:49 2007 -0500 @@ -67,7 +67,8 @@ static CMPIStatus sys_to_cap(const CMPIO sys_name = cu_get_str_path(ref, "Name"); if (!STREQ(sys_name, host_name)) { - cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, "System '%s' is not a host system.", sys_name); goto out; } @@ -203,8 +204,9 @@ static CMPIStatus pool_to_alloc(const CM inst_id = cu_get_str_path(ref, "InstanceID"); if (inst_id == NULL) { - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Could not get InstanceID."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Could not get InstanceID."); goto out; } @@ -216,8 +218,9 @@ static CMPIStatus pool_to_alloc(const CM ret = cu_get_u16_path(ref, "ResourceType", &type); if (ret != 1) { - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Could not get ResourceType."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Could not get ResourceType."); goto out; } CMSetProperty(inst, "ResourceType", &type, CMPI_uint16); diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_ElementConformsToProfile.c Tue Nov 27 16:09:49 2007 -0500 @@ -60,9 +60,9 @@ static CMPIStatus elem_instances(const C classname = get_typed_class("Xen", profile->provider_name); if (classname == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Can't assemble classname." ); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Can't assemble classname." ); goto out; } @@ -72,18 +72,18 @@ static CMPIStatus elem_instances(const C en = CBEnumInstances(_BROKER, info->context , op, NULL, &s); if (en == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Upcall enumInstances to target class failed."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Upcall enumInstances to target class failed."); goto error; } while (CMHasNext(en, &s)) { data = CMGetNext(en, &s); if (CMIsNullObject(data.value.inst)) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Failed to retrieve enumeration entry."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to retrieve enumeration entry."); goto error; } @@ -106,9 +106,9 @@ static CMPIStatus prof_to_elem(const CMP id = cu_get_str_path(ref, "InstanceID"); if (id == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "No InstanceID specified"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No InstanceID specified"); goto out; } @@ -139,8 +139,9 @@ static CMPIStatus elem_to_prof(const CMP classname = class_base_name(CLASSNAME(ref)); if (classname == NULL) { - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Can't get class name."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Can't get class name."); goto out; } @@ -154,8 +155,9 @@ static CMPIStatus elem_to_prof(const CMP NULL, candidate); if (instance == NULL) { - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Can't create profile instance."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Can't create profile instance."); goto error; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_EnabledLogicalElementCapabilities.c --- a/src/Virt_EnabledLogicalElementCapabilities.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_EnabledLogicalElementCapabilities.c Tue Nov 27 16:09:49 2007 -0500 @@ -64,8 +64,9 @@ static CMPIStatus set_inst_properties(co devid = get_fq_devid((char *)sys_name, "0"); if (devid == NULL) { - CMSetStatusWithChars(broker, &s, CMPI_RC_ERR_FAILED, - "Could not get full ID."); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get full ID."); goto error1; } @@ -112,34 +113,34 @@ CMPIStatus get_ele_cap(const CMPIBroker sys_name = cu_get_str_path(ref, "Name"); if (sys_name == NULL) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Missing key: Name"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Missing key: Name"); goto out; } classname = get_typed_class(CLASSNAME(ref), "EnabledLogicalElementCapabilities"); if (classname == NULL) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Invalid class"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Invalid class"); goto out; } op = CMNewObjectPath(broker, NAMESPACE(ref), classname, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Cannot get object path for ELECapabilities"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Cannot get object path for ELECapabilities"); goto out; } *inst = CMNewInstance(broker, op, &s); if ((s.rc != CMPI_RC_OK) || (CMIsNullObject(*inst))) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Failed to instantiate HostSystem"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to instantiate HostSystem"); goto out; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_HostSystem.c --- a/src/Virt_HostSystem.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_HostSystem.c Tue Nov 27 16:09:49 2007 -0500 @@ -67,25 +67,25 @@ CMPIStatus get_host_cs(const CMPIBroker classname = get_typed_class(CLASSNAME(reference), "HostSystem"); if (classname == NULL) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Invalid class"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Invalid class"); goto out; } op = CMNewObjectPath(broker, ns, classname, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Cannot get object path for HostSystem"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Cannot get object path for HostSystem"); goto out; } inst = CMNewInstance(broker, op, &s); if ((s.rc != CMPI_RC_OK) || (CMIsNullObject(op))) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Failed to instantiate HostSystem"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to instantiate HostSystem"); goto out; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_HostedDependency.c --- a/src/Virt_HostedDependency.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_HostedDependency.c Tue Nov 27 16:09:49 2007 -0500 @@ -66,9 +66,9 @@ static CMPIStatus host_to_vs(const CMPIO if (ret) { CMSetStatus(&s, CMPI_RC_OK); } else { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Failed to get domain list"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to get domain list"); } CMSetStatus(&s, CMPI_RC_OK); diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_HostedResourcePool.c Tue Nov 27 16:09:49 2007 -0500 @@ -71,8 +71,7 @@ static CMPIStatus sys_to_pool(const CMPI if (prop != NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, - "No such HostSystem instance (%s)", - prop); + "No such HostSystem instance (%s)", prop); return s; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_RegisteredProfile.c --- a/src/Virt_RegisteredProfile.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_RegisteredProfile.c Tue Nov 27 16:09:49 2007 -0500 @@ -103,8 +103,9 @@ static CMPIStatus enum_profs(const CMPIO properties, profiles[i]); if (instance == NULL) { - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Can't create profile instance."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Can't create profile instance."); goto out; } @@ -129,9 +130,9 @@ static CMPIStatus get_prof(const CMPIObj id = cu_get_str_path(ref, "InstanceID"); if (id == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "No InstanceID specified"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No InstanceID specified"); return s; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_SettingsDefineCapabilities.c Tue Nov 27 16:09:49 2007 -0500 @@ -697,8 +697,9 @@ static CMPIInstance *sdc_rasd_inst(const range = SDC_RANGE_POINT; break; default: - CMSetStatusWithChars(broker, s, CMPI_RC_ERR_FAILED, - "Unsupported sdc_rasd type."); + cu_statusf(broker, s, + CMPI_RC_ERR_FAILED, + "Unsupported sdc_rasd type."); goto out; } @@ -765,8 +766,9 @@ static CMPIStatus sdc_rasds_for_type(con } else { CU_DEBUG("Unsupported type."); - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Unsupported device type."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported device type."); } out: @@ -785,8 +787,9 @@ static CMPIStatus alloc_cap_to_rasd(cons ret = cu_get_u16_path(ref, "ResourceType", &type); if (ret != 1) { - CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Could not get ResourceType."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Could not get ResourceType."); goto out; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_VSSD.c --- a/src/Virt_VSSD.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_VSSD.c Tue Nov 27 16:09:49 2007 -0500 @@ -143,9 +143,9 @@ static CMPIStatus enum_vssd(const CMPIOb count = get_domain_list(conn, &list); if (count < 0) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Failed to enumerate domains"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to enumerate domains"); goto out; } else if (count == 0) { CMSetStatus(&s, CMPI_RC_OK); @@ -229,7 +229,7 @@ static CMPIStatus GetInstance(CMPIInstan if (!parse_instanceid(reference, NULL, &locid)) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Invalid InstanceID specified"); + "Invalid InstanceID specified"); return s; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_VirtualSystemManagementCapabilities.c --- a/src/Virt_VirtualSystemManagementCapabilities.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_VirtualSystemManagementCapabilities.c Tue Nov 27 16:09:49 2007 -0500 @@ -60,8 +60,9 @@ static CMPIStatus set_inst_properties(co devid = get_fq_devid((char *)sys_name, "0"); if (devid == NULL) { - CMSetStatusWithChars(broker, &s, CMPI_RC_ERR_FAILED, - "Could not get full ID."); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get full ID."); goto out; } CMSetProperty(inst, "InstanceID", (CMPIValue *)devid, CMPI_chars); @@ -99,34 +100,34 @@ CMPIStatus get_vsm_cap(const CMPIBroker sys_name = cu_get_str_path(ref, "Name"); if (sys_name == NULL) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Missing key: Name"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Missing key: Name"); goto out; } classname = get_typed_class(CLASSNAME(ref), "VirtualSystemManagementCapabilities"); if (classname == NULL) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Invalid class"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Invalid class"); goto out; } op = CMNewObjectPath(broker, NAMESPACE(ref), classname, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Cannot get object path for VSMCapabilities"); + 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))) { - CMSetStatusWithChars(broker, &s, - CMPI_RC_ERR_FAILED, - "Failed to instantiate HostSystem"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to instantiate HostSystem"); goto out; } diff -r c1c0c6a06447 -r d798c4c8a940 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Nov 26 10:32:08 2007 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Tue Nov 27 16:09:49 2007 -0500 @@ -108,9 +108,9 @@ static CMPIStatus define_system_parse_ar sys); if (ret) { CU_DEBUG("Unable to parse SystemSettings instance"); - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "SystemSettings parse error"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "SystemSettings parse error"); goto out; } @@ -287,9 +287,9 @@ static CMPIInstance *connect_and_create( dom = virDomainDefineXML(conn, xml); if (dom == NULL) { CU_DEBUG("Failed to define domain from XML"); - CMSetStatusWithChars(_BROKER, s, - CMPI_RC_ERR_FAILED, - "Failed to create domain"); + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Failed to create domain"); return NULL; } @@ -297,9 +297,9 @@ static CMPIInstance *connect_and_create( inst = instance_from_name(_BROKER, conn, (char *)name, ref); if (inst == NULL) { CU_DEBUG("Failed to get new instance"); - CMSetStatusWithChars(_BROKER, s, - CMPI_RC_ERR_FAILED, - "Failed to lookup resulting system"); + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Failed to lookup resulting system"); } virConnectClose(conn); @@ -636,8 +636,7 @@ static CMPIStatus _resource_dynamic(stru if (func(dom, dev) == 0) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Unable to change (%i) device", - action); + "Unable to change (%i) device", action); } else { CMSetStatus(&s, CMPI_RC_OK); } @@ -670,8 +669,7 @@ static CMPIStatus resource_del(struct do else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Cannot delete resources of type %" PRIu16, - type); + "Cannot delete resources of type %" PRIu16, type); goto out; } @@ -716,8 +714,7 @@ static CMPIStatus resource_add(struct do if ((type == CIM_RASD_TYPE_MEM) || (_list == NULL)) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Cannot add resources of type %" PRIu16, - type); + "Cannot add resources of type %" PRIu16, type); goto out; } @@ -727,8 +724,7 @@ static CMPIStatus resource_add(struct do */ cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "[TEMP] Cannot add resources of type %" PRIu16, - type); + "[TEMP] Cannot add resources of type %" PRIu16, type); goto out; } @@ -781,8 +777,7 @@ static CMPIStatus resource_mod(struct do else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Cannot modify resources of type %" PRIu16, - type); + "Cannot modify resources of type %" PRIu16, type); goto out; }

2 3

[PATCH] [CU] Convert to cu_statusf
by Jay Gagnon 27 Nov '07

27 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1196198953 18000 # Node ID 7b6ed8beebcf7c15cc28f9492baa0d4ebdfb76f8 # Parent c57cd3b49b6109110331ee64ea3a629c16ff4423 [CU] Convert to cu_statusf. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r c57cd3b49b61 -r 7b6ed8beebcf std_invokemethod.c --- a/std_invokemethod.c Tue Nov 27 12:20:06 2007 -0800 +++ b/std_invokemethod.c Tue Nov 27 16:29:13 2007 -0500 @@ -100,9 +100,9 @@ CMPIStatus _std_invokemethod(CMPIMethodM } if (h == NULL) { - CMSetStatusWithChars(ctx->broker, &s, - CMPI_RC_ERR_FAILED, - "Unknown Method"); + cu_statusf(ctx->broker, &s, + CMPI_RC_ERR_FAILED, + "Unknown Method"); goto exit; }

2 1

[PATCH] [CU][RFC] Correct a few API issues
by Dan Smith 27 Nov '07

27 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1196194806 28800 # Node ID 256b237ba19f9e178719ed657f2b9a8f0d44d433 # Parent 64e4f6355b52e4b7bcc984ec557610a1fa9a9786 [CU][RFC] Correct a few API issues that I think need to be resolved before we snap a release. Some of the cu_get_* functions returned values instead of a CMPIrc's like everything else, so this changes that. Also, return const char *'s from the broker memory so that the callers don't need to free the result. This will require some work in libvirt-cim to make sure the new API is adhered to properly. If this is okay with people, I'll follow up with a patch to libvirt-cim to make those changes. Any other discussion about things that should change in the libcmpiutil API is welcomed. Changes from last time: - Fix cu_get_str_prop() to return a const broker string as well Patch set to make associated changes to libvirt-cim to follow... Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 64e4f6355b52 -r 256b237ba19f args_util.c --- a/args_util.c Tue Nov 27 06:33:45 2007 -0800 +++ b/args_util.c Tue Nov 27 12:20:06 2007 -0800 @@ -32,7 +32,9 @@ #define CU_WEAK_TYPES 1 -char *cu_get_str_path(const CMPIObjectPath *reference, const char *key) +CMPIrc cu_get_str_path(const CMPIObjectPath *reference, + const char *key, + const char **val) { CMPIData data; CMPIStatus s; @@ -42,18 +44,20 @@ char *cu_get_str_path(const CMPIObjectPa if ((s.rc != CMPI_RC_OK) || CMIsNullValue(data) || CMIsNullObject(data.value.string)) - return NULL; + return CMPI_RC_ERR_FAILED; value = CMGetCharPtr(data.value.string); if ((value == NULL) || (*value == '\0')) - return NULL; - - return strdup(value); -} - -int cu_get_u16_path(const CMPIObjectPath *reference, - const char *key, - uint16_t *target) + return CMPI_RC_ERR_TYPE_MISMATCH; + + *val = value; + + return CMPI_RC_OK; +} + +CMPIrc cu_get_u16_path(const CMPIObjectPath *reference, + const char *key, + uint16_t *target) { CMPIData data; CMPIStatus s; @@ -61,11 +65,11 @@ int cu_get_u16_path(const CMPIObjectPath data = CMGetKey(reference, key, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullValue(data)) - return 0; + return CMPI_RC_ERR_FAILED; *target = data.value.uint16; - return 1; + return CMPI_RC_OK; } const char *cu_check_args(const CMPIArgs *args, const char **names) @@ -85,92 +89,101 @@ const char *cu_check_args(const CMPIArgs return NULL; } -char *cu_get_str_arg(const CMPIArgs *args, const char *name) -{ - CMPIData argdata; - char *argval; +CMPIrc cu_get_str_arg(const CMPIArgs *args, const char *name, const char **val) +{ + CMPIData argdata; CMPIStatus s; argdata = CMGetArg(args, name, &s); if ((s.rc != CMPI_RC_OK) || (CMIsNullValue(argdata))) - return NULL; + return CMPI_RC_ERR_INVALID_PARAMETER; if ((argdata.type != CMPI_string) || CMIsNullObject(argdata.value.string)) - return NULL; - - argval = strdup(CMGetCharPtr(argdata.value.string)); - - return argval; -} - -CMPIObjectPath *cu_get_ref_arg(const CMPIArgs *args, const char *name) + return CMPI_RC_ERR_TYPE_MISMATCH; + + *val = CMGetCharPtr(argdata.value.string); + + return CMPI_RC_OK; +} + +CMPIrc cu_get_ref_arg(const CMPIArgs *args, + const char *name, + CMPIObjectPath **op) { CMPIData argdata; CMPIStatus s; argdata = CMGetArg(args, name, &s); if ((s.rc != CMPI_RC_OK) || (CMIsNullValue(argdata))) - return NULL; + return CMPI_RC_ERR_INVALID_PARAMETER; if ((argdata.type != CMPI_ref) || CMIsNullObject(argdata.value.ref)) - return NULL; - - return argdata.value.ref; -} - -CMPIInstance *cu_get_inst_arg(const CMPIArgs *args, const char *name) -{ - CMPIData argdata; - CMPIStatus s; - - argdata = CMGetArg(args, name, &s); - if ((s.rc != CMPI_RC_OK) || (CMIsNullValue(argdata))) { - return NULL; - } + return CMPI_RC_ERR_TYPE_MISMATCH; + + *op = argdata.value.ref; + + return CMPI_RC_OK; +} + +CMPIrc cu_get_inst_arg(const CMPIArgs *args, + const char *name, + CMPIInstance **inst) +{ + CMPIData argdata; + CMPIStatus s; + + argdata = CMGetArg(args, name, &s); + if ((s.rc != CMPI_RC_OK) || (CMIsNullValue(argdata))) + return CMPI_RC_ERR_INVALID_PARAMETER; if ((argdata.type != CMPI_instance) || - CMIsNullObject(argdata.value.inst)) { - return NULL; - } - - return argdata.value.inst; -} - -CMPIArray *cu_get_array_arg(const CMPIArgs *args, const char *name) + CMIsNullObject(argdata.value.inst)) + CMPI_RC_ERR_TYPE_MISMATCH; + + *inst = argdata.value.inst; + + return CMPI_RC_OK; +} + +CMPIrc cu_get_array_arg(const CMPIArgs *args, + const char *name, + CMPIArray **array) { CMPIData argdata; CMPIStatus s; argdata = CMGetArg(args, name, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullValue(argdata)) - return NULL; + return CMPI_RC_ERR_INVALID_PARAMETER; if (!CMIsArray(argdata) || CMIsNullObject(argdata.value.array)) - return NULL; - - return argdata.value.array; -} - -int cu_get_u16_arg(const CMPIArgs *args, const char *name, uint16_t *target) + return CMPI_RC_ERR_TYPE_MISMATCH; + + *array = argdata.value.array; + + return CMPI_RC_OK; +} + +CMPIrc cu_get_u16_arg(const CMPIArgs *args, const char *name, uint16_t *target) { CMPIData argdata; CMPIStatus s; argdata = CMGetArg(args, name, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullValue(argdata)) - return 0; + return CMPI_RC_ERR_INVALID_PARAMETER; #ifdef CU_WEAK_TYPES if (!(argdata.type & CMPI_INTEGER)) #else if (argdata.type != CMPI_uint16) #endif - return 0; + return CMPI_RC_ERR_TYPE_MISMATCH; *target = argdata.value.uint16; - return 1; + return CMPI_RC_OK; } #define REQUIRE_PROPERTY_DEFINED(i, p, pv, s) \ @@ -182,7 +195,7 @@ int cu_get_u16_arg(const CMPIArgs *args, CMPIrc cu_get_str_prop(const CMPIInstance *inst, const char *prop, - char **target) + const char **target) { CMPIData value; CMPIStatus s; @@ -198,8 +211,7 @@ CMPIrc cu_get_str_prop(const CMPIInstanc if ((prop_val = CMGetCharPtr(value.value.string)) == NULL) return CMPI_RC_ERROR; - if ((*target = strdup(prop_val)) == NULL) - return CMPI_RC_ERROR; + *target = prop_val; return CMPI_RC_OK; } diff -r 64e4f6355b52 -r 256b237ba19f libcmpiutil.h --- a/libcmpiutil.h Tue Nov 27 06:33:45 2007 -0800 +++ b/libcmpiutil.h Tue Nov 27 12:20:06 2007 -0800 @@ -91,18 +91,22 @@ const char *cu_check_args(const CMPIArgs * * @param args The argument list to search * @param name The name of the argument - * @returns The string argument's value, or NULL if error (must be free()'d) - */ -char *cu_get_str_arg(const CMPIArgs *args, const char *name); + * @param val The value of the argument (must be free()'d) + * @returns CMPI_RC_OK if successful + */ +CMPIrc cu_get_str_arg(const CMPIArgs *args, const char *name, const char **val); /** * Get a reference argument * * @param args The argument list to search * @param name The name of the argument - * @returns The reference argument's value, or NULL if error - */ -CMPIObjectPath *cu_get_ref_arg(const CMPIArgs *args, const char *name); + * @param op The reference argument's value + * @returns CMPI_RC_OK if successful + */ +CMPIrc cu_get_ref_arg(const CMPIArgs *args, + const char *name, + CMPIObjectPath **op); /** * Get an instance argument @@ -111,7 +115,9 @@ CMPIObjectPath *cu_get_ref_arg(const CMP * @param name The name of the argument * @returns The instance argument's value, or NULL if error */ -CMPIInstance *cu_get_inst_arg(const CMPIArgs *args, const char *name); +CMPIrc cu_get_inst_arg(const CMPIArgs *args, + const char *name, + CMPIInstance **inst); /** * Get an array argument @@ -120,7 +126,9 @@ CMPIInstance *cu_get_inst_arg(const CMPI * @param name The name of the argument * @returns The array argument's value, or NULL if error */ -CMPIArray *cu_get_array_arg(const CMPIArgs *args, const char *name); +CMPIrc cu_get_array_arg(const CMPIArgs *args, + const char *name, + CMPIArray **array); /** * Get a uint16 argument @@ -128,18 +136,22 @@ CMPIArray *cu_get_array_arg(const CMPIAr * @param args The argument list to search * @param name The name of the argument * @param target The uint16_t to reflect the argument value - * @returns nonzero on success, zero otherwise - */ -int cu_get_u16_arg(const CMPIArgs *args, const char *name, uint16_t *target); + * @returns CMPI_RC_OK if successful + */ +CMPIrc cu_get_u16_arg(const CMPIArgs *args, const char *name, uint16_t *target); /** * Get a string component of an object path * - * @param reference The object path + * @param ref The object path * @param key The name of the component to return - * @returns The value of the component, or NULL if error (must be free()'d) - */ -char *cu_get_str_path(const CMPIObjectPath *reference, const char *key); + * @param val The value of the component, or NULL if error (must be + * free()'d) + * @returns CMPI_RC_OK on success + */ +CMPIrc cu_get_str_path(const CMPIObjectPath *ref, + const char *key, + const char **val); /** * Get a uint16 component of an object path @@ -147,11 +159,11 @@ char *cu_get_str_path(const CMPIObjectPa * @param reference The object path * @param key The name of the component to return * @param target A pointer to the uint16 to set - * @returns nonzero on success, zero otherwise - */ -int cu_get_u16_path(const CMPIObjectPath *reference, - const char *key, - uint16_t *target); + * @returns CMPI_RC_OK if successful + */ +CMPIrc cu_get_u16_path(const CMPIObjectPath *reference, + const char *key, + uint16_t *target); /* Forward declaration */ struct inst_list; @@ -202,7 +214,7 @@ unsigned int cu_return_instance_names(co */ CMPIrc cu_get_str_prop(const CMPIInstance *inst, const char *prop, - char **target); + const char **target); /** * Get a boolean property of an instance diff -r 64e4f6355b52 -r 256b237ba19f std_indication.c --- a/std_indication.c Tue Nov 27 06:33:45 2007 -0800 +++ b/std_indication.c Tue Nov 27 12:20:06 2007 -0800 @@ -49,7 +49,8 @@ static CMPIStatus raise(struct std_indic if (ctx->handler->raise_fn == NULL) return (CMPIStatus){CMPI_RC_OK, NULL}; - inst = cu_get_inst_arg(argsin, "Indication"); + if (cu_get_inst_arg(argsin, "Indication", &inst) != CMPI_RC_OK) + return (CMPIStatus){CMPI_RC_ERR_FAILED, NULL}; return ctx->handler->raise_fn(context, inst); }

2 2

[PATCH] [RFC] Enhance handling of association's references
by Heidi Eckhart 27 Nov '07

27 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195819371 -3600 # Node ID db20c6206fb6decb484035bec81d7c7f2be75eae # Parent bf54de6af2e210bef57d74cf12e4872f6ba2da4f [RFC] Enhance handling of association's references The source and target classnames of std_assoc are now lists, containing all supported classnames. This approach frees the provider from listing all possible combinations as instances of std_assoc. Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r bf54de6af2e2 -r db20c6206fb6 std_association.c --- a/std_association.c Tue Nov 20 16:24:27 2007 -0800 +++ b/std_association.c Fri Nov 23 13:02:51 2007 +0100 @@ -61,18 +61,24 @@ static bool match_class(const CMPIBroker static bool match_class(const CMPIBroker *broker, const char *ns, const char *test_class, - const char *comp_class) + char **comp_class_list) { CMPIObjectPath *rop; + char *comp_class; + int i; rop = CMNewObjectPath(broker, ns, test_class, NULL); - if ((test_class == NULL) || - (comp_class == NULL) || - match_op(broker, rop, comp_class)) - return true; - else - return false; + for (i = 0; comp_class_list[i]; i++) { + comp_class = comp_class_list[i]; + + if ((test_class == NULL) || + (comp_class == NULL) || + match_op(broker, rop, comp_class)) + return true; + } + + return false; } static CMPIStatus filter_results(struct inst_list *list, @@ -113,15 +119,30 @@ std_assoc_get_handler(const struct std_a std_assoc_get_handler(const struct std_assoc_ctx *ctx, const CMPIObjectPath *ref) { - struct std_assoc *ptr; - int i; + struct std_assoc *hdl = NULL; + char *source_class; + int i, j; for (i = 0; ctx->handlers[i]; i++) { - ptr = ctx->handlers[i]; - - if (CMClassPathIsA(ctx->brkr, ref, ptr->source_class, NULL)) - return ptr; - } + hdl = ctx->handlers[i]; + + for (j = 0; hdl->source_class[j]; j++) { + source_class = hdl->source_class[j]; + + if (CMClassPathIsA(ctx->brkr, + ref, + source_class, + NULL)) + break; + + source_class = NULL; + } + if (source_class) + break; + } + + if (hdl) + return hdl; return NULL; } @@ -144,9 +165,6 @@ static CMPIStatus do_assoc(struct std_as handler = std_assoc_get_handler(ctx, ref); if (handler == NULL) { CU_DEBUG("No handler found."); - cu_statusf(ctx->brkr, &s, - CMPI_RC_ERR_FAILED, - "Unable to handle this association"); goto out; } @@ -243,9 +261,7 @@ static CMPIStatus do_ref(struct std_asso handler = std_assoc_get_handler(ctx, ref); if (handler == NULL) { - cu_statusf(ctx->brkr, &s, - CMPI_RC_ERR_FAILED, - "Unable to handle this association"); + CU_DEBUG("No handler found."); goto out; } diff -r bf54de6af2e2 -r db20c6206fb6 std_association.h --- a/std_association.h Tue Nov 20 16:24:27 2007 -0800 +++ b/std_association.h Fri Nov 23 13:02:51 2007 +0100 @@ -37,13 +37,13 @@ typedef CMPIInstance *(*make_ref_t)(cons struct std_assoc *); struct std_assoc { - char *source_class; + char **source_class; char *source_prop; - char *target_class; + char **target_class; char *target_prop; - char *assoc_class; + char **assoc_class; assoc_handler_t handler; make_ref_t make_ref;

3 4

[PATCH 0 of 3] Fixes to RegisteredProfile and ECTP depending on connect_by_classname approach
by Heidi Eckhart 27 Nov '07

27 Nov '07

3 11

[PATCH] [RFC] Check for matching hypervisor prefixes
by Heidi Eckhart 27 Nov '07

27 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1196167642 -3600 # Node ID 901bcb9e9fb3272956e55b01d2b1eb05f7e35a9c # Parent 6200efdd04aafa69f2f76b1cbc0c3567406e829f [RFC] Check for matching hypervisor prefixes The class prefixes need to be checked for compliance, as a request for KVM_RegisteredProfile with Xen_ECTP as assoc does not return any instances. Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 6200efdd04aa -r 901bcb9e9fb3 libxkutil/misc_util.c --- a/libxkutil/misc_util.c Tue Nov 27 11:12:59 2007 +0100 +++ b/libxkutil/misc_util.c Tue Nov 27 13:47:22 2007 +0100 @@ -33,6 +33,7 @@ #include "cmpimacs.h" #include "libcmpiutil.h" +#include "std_association.h" #include "misc_util.h" #include "cs_util.h" @@ -304,6 +305,43 @@ bool provider_is_responsible(const CMPIB free(pfx); return rc; } + +bool assoc_match_prefix(const CMPIObjectPath *reference, + struct std_assoc_info *info) +{ + char *ref_pfx = NULL; + char *pfx = NULL; + bool rc = true; + + ref_pfx = class_prefix_name(CLASSNAME(reference)); + + if (info->assoc_class) { + pfx = class_prefix_name(info->assoc_class); + + if (!STREQC(ref_pfx, pfx)) { + if (!STREQC("CIM", pfx)) + rc = false; + } + + free(pfx); + } + + if (info->result_class) { + pfx = class_prefix_name(info->result_class); + + if (!STREQC(ref_pfx, pfx)) { + if (!STREQC("CIM", pfx)) + rc = false; + } + + free(pfx); + } + + free(ref_pfx); + return rc; +} + + bool domain_online(virDomainPtr dom) { diff -r 6200efdd04aa -r 901bcb9e9fb3 libxkutil/misc_util.h --- a/libxkutil/misc_util.h Tue Nov 27 11:12:59 2007 +0100 +++ b/libxkutil/misc_util.h Tue Nov 27 13:47:22 2007 +0100 @@ -32,6 +32,7 @@ #include "cmpimacs.h" #include <libcmpiutil.h> +#include <std_association.h> /* Check if the provider is reponsible for the given class: * e.g. Xen is running on the system and KVM_... is asked for, @@ -105,6 +106,9 @@ bool libvirt_cim_init(void); #endif +bool assoc_match_prefix(const CMPIObjectPath *reference, + struct std_assoc_info *info); + /* * Local Variables: * mode: C diff -r 6200efdd04aa -r 901bcb9e9fb3 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Tue Nov 27 11:12:59 2007 +0100 +++ b/src/Virt_ElementConformsToProfile.c Tue Nov 27 13:47:22 2007 +0100 @@ -107,6 +107,9 @@ static CMPIStatus prof_to_elem(const CMP char *id; int i; + if (!assoc_match_prefix(ref, info)) + goto out; + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); if (conn == NULL) return s; @@ -147,6 +150,9 @@ static CMPIStatus elem_to_prof(const CMP char *classname; struct reg_prof *candidate; int i; + + if (!assoc_match_prefix(ref, info)) + goto out; conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); if (conn == NULL)

2 1

[PATCH] [RFC] Enhance handling of association's references
by Heidi Eckhart 27 Nov '07

27 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1196160333 -3600 # Node ID 16ac621eb3b34d11caca00100901d27bede7a7c7 # Parent bf54de6af2e210bef57d74cf12e4872f6ba2da4f [RFC] Enhance handling of association's references The source and target classnames of std_assoc are now lists, containing all supported classnames. This approach frees the provider from listing all possible combinations as instances of std_assoc. Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r bf54de6af2e2 -r 16ac621eb3b3 std_association.c --- a/std_association.c Tue Nov 20 16:24:27 2007 -0800 +++ b/std_association.c Tue Nov 27 11:45:33 2007 +0100 @@ -61,18 +61,44 @@ static bool match_class(const CMPIBroker static bool match_class(const CMPIBroker *broker, const char *ns, const char *test_class, - const char *comp_class) + char **comp_class_list) { CMPIObjectPath *rop; + char *comp_class; + int i; rop = CMNewObjectPath(broker, ns, test_class, NULL); - if ((test_class == NULL) || - (comp_class == NULL) || - match_op(broker, rop, comp_class)) - return true; - else - return false; + for (i = 0; comp_class_list[i]; i++) { + comp_class = comp_class_list[i]; + + if ((test_class == NULL) || + (comp_class == NULL) || + match_op(broker, rop, comp_class)) + return true; + } + + return false; +} + +static bool match_source_class(const CMPIBroker *broker, + const CMPIObjectPath *ref, + struct std_assoc *ptr) +{ + int i; + char *source_class; + + for (i = 0; ptr->source_class[i]; i++) { + source_class = ptr->source_class[i]; + + if (CMClassPathIsA(broker, + ref, + source_class, + NULL)) + return true; + } + + return false; } static CMPIStatus filter_results(struct inst_list *list, @@ -113,13 +139,13 @@ std_assoc_get_handler(const struct std_a std_assoc_get_handler(const struct std_assoc_ctx *ctx, const CMPIObjectPath *ref) { - struct std_assoc *ptr; + struct std_assoc *ptr = NULL; int i; for (i = 0; ctx->handlers[i]; i++) { ptr = ctx->handlers[i]; - if (CMClassPathIsA(ctx->brkr, ref, ptr->source_class, NULL)) + if (match_source_class(ctx->brkr, ref, ptr)) return ptr; } @@ -144,9 +170,6 @@ static CMPIStatus do_assoc(struct std_as handler = std_assoc_get_handler(ctx, ref); if (handler == NULL) { CU_DEBUG("No handler found."); - cu_statusf(ctx->brkr, &s, - CMPI_RC_ERR_FAILED, - "Unable to handle this association"); goto out; } @@ -243,9 +266,7 @@ static CMPIStatus do_ref(struct std_asso handler = std_assoc_get_handler(ctx, ref); if (handler == NULL) { - cu_statusf(ctx->brkr, &s, - CMPI_RC_ERR_FAILED, - "Unable to handle this association"); + CU_DEBUG("No handler found."); goto out; } diff -r bf54de6af2e2 -r 16ac621eb3b3 std_association.h --- a/std_association.h Tue Nov 20 16:24:27 2007 -0800 +++ b/std_association.h Tue Nov 27 11:45:33 2007 +0100 @@ -37,13 +37,13 @@ typedef CMPIInstance *(*make_ref_t)(cons struct std_assoc *); struct std_assoc { - char *source_class; + char **source_class; char *source_prop; - char *target_class; + char **target_class; char *target_prop; - char *assoc_class; + char **assoc_class; assoc_handler_t handler; make_ref_t make_ref;

2 1