- CIM - libvirt List Archives

[PATCH] Fix AllocationCapabilities to make EnumInstances and EnumInstanceNames work
by Jay Gagnon 21 Nov '07

21 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1195593960 18000 # Node ID 0d019645db934b886b71a744c12a83ce5034e7e2 # Parent 2e1dc075f0a9996bfdd2f437928d261081c1f9d6 Fix AllocationCapabilities to make EnumInstances and EnumInstanceNames work. This should include all the suggestions from the first iteration, and the missing virConnectClose from the second. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 2e1dc075f0a9 -r 0d019645db93 src/Makefile.am --- a/src/Makefile.am Tue Nov 20 14:56:34 2007 -0500 +++ b/src/Makefile.am Tue Nov 20 16:26:00 2007 -0500 @@ -91,9 +91,9 @@ libVirt_ElementCapabilities_la_LIBADD = -lVirt_ComputerSystem \ -lVirt_HostSystem -libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la +libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c -libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD +libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD -lVirt_DevicePool libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c diff -r 2e1dc075f0a9 -r 0d019645db93 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Tue Nov 20 14:56:34 2007 -0500 +++ b/src/Virt_AllocationCapabilities.c Tue Nov 20 16:26:00 2007 -0500 @@ -32,6 +32,7 @@ #include "Virt_AllocationCapabilities.h" #include "Virt_RASD.h" +#include "Virt_DevicePool.h" const static CMPIBroker *_BROKER; @@ -85,6 +86,101 @@ static CMPIStatus return_alloc_cap(const else CMReturnInstance(results, inst); out: + return s; +} + +static CMPIStatus ac_from_pool(const CMPIBroker *broker, + const CMPIObjectPath *ref, + CMPIInstance *pool, + CMPIInstance **alloc_cap) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + *alloc_cap = get_typed_instance(broker, + CLASSNAME(ref), + "AllocationCapabilities", + NAMESPACE(ref)); + if (*alloc_cap == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get alloc_cap instance"); + goto out; + } + + s = cu_copy_prop(broker, pool, *alloc_cap, "InstanceID", NULL); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error copying InstanceID"); + goto out; + } + + s = cu_copy_prop(broker, pool, *alloc_cap, "ResourceType", NULL); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error copying InstanceID"); + goto out; + } + out: + return s; +} + +static CMPIStatus alloc_cap_instances(const CMPIBroker *broker, + const CMPIObjectPath *ref, + const CMPIResult *results, + bool names_only, + const char **properties) +{ + int i; + virConnectPtr conn = NULL; + CMPIInstance *alloc_cap_inst; + struct inst_list alloc_cap_list; + struct inst_list device_pool_list; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + CU_DEBUG("In alloc_cap_instances()"); + + inst_list_init(&device_pool_list); + inst_list_init(&alloc_cap_list); + + if (!provider_is_responsible(broker, ref, &s)) + goto out; + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + if (conn == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not connect to hypervisor"); + goto out; + } + + s = get_all_pools(broker, conn, NAMESPACE(ref), &device_pool_list); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error fetching device pools"); + goto out; + } + + for (i = 0; i < device_pool_list.cur; i++) { + s = ac_from_pool(broker, ref, + device_pool_list.list[i], + &alloc_cap_inst); + if (s.rc != CMPI_RC_OK) + goto out; + + inst_list_add(&alloc_cap_list, alloc_cap_inst); + } + + if (names_only) + cu_return_instance_names(results, &alloc_cap_list); + else + cu_return_instances(results, &alloc_cap_list); + + out: + virConnectClose(conn); + inst_list_free(&alloc_cap_list); + inst_list_free(&device_pool_list); return s; } @@ -97,8 +193,23 @@ static CMPIStatus GetInstance(CMPIInstan return return_alloc_cap(reference, results, 0); } -DEFAULT_EI(); -DEFAULT_EIN(); +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return alloc_cap_instances(_BROKER, reference, results, true, NULL); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + return alloc_cap_instances(_BROKER, reference, results, false, properties); +} + DEFAULT_CI(); DEFAULT_MI(); DEFAULT_DI();

2 1

[PATCH 0 of 2] AllocationCapabilities fixes, second iteration
by Jay Gagnon 21 Nov '07

21 Nov '07

I did the get_all_pools as a separate patch since it's not strictly related to the alloc cap fixes. It can be applied without the alloc cap fixes if there are still problems with them.

3 5

[PATCH 0 of 2] Updated ElementSettingData to support RASD instances.
by Kaitlin Rupert 21 Nov '07

21 Nov '07

3 7

[PATCH] Fix AllocationCapabilities to make EnumInstances and EnumInstanceNames work
by Jay Gagnon 21 Nov '07

21 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1195510519 18000 # Node ID 9e000f9f9096cad7a40b1221b467fe99efc4b93f # Parent 79f43a4ffc38d7227e17432b971639ae20f6f6ed Fix AllocationCapabilities to make EnumInstances and EnumInstanceNames work. I don't have a ton of experience with instance providers, so this might require a little extra scrutiny as I'm sure there are several rookie mistakes. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 79f43a4ffc38 -r 9e000f9f9096 src/Makefile.am --- a/src/Makefile.am Mon Nov 19 16:19:06 2007 -0500 +++ b/src/Makefile.am Mon Nov 19 17:15:19 2007 -0500 @@ -91,9 +91,9 @@ libVirt_ElementCapabilities_la_LIBADD = -lVirt_ComputerSystem \ -lVirt_HostSystem -libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la +libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c -libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD +libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD -lVirt_DevicePool libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c diff -r 79f43a4ffc38 -r 9e000f9f9096 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Mon Nov 19 16:19:06 2007 -0500 +++ b/src/Virt_AllocationCapabilities.c Mon Nov 19 17:15:19 2007 -0500 @@ -32,6 +32,7 @@ #include "Virt_AllocationCapabilities.h" #include "Virt_RASD.h" +#include "Virt_DevicePool.h" const static CMPIBroker *_BROKER; @@ -83,6 +84,88 @@ static CMPIStatus return_alloc_cap(const else CMReturnInstance(results, inst); out: + return s; +} + +static CMPIStatus alloc_cap_instances(const CMPIBroker *broker, + const CMPIObjectPath *ref, + const CMPIResult *results, + bool names_only, + const char **properties) +{ + int i; + virConnectPtr conn; + CMPIInstance *inst; + struct inst_list alloc_cap_list; + struct inst_list device_pool_list; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + CU_DEBUG("In alloc_cap_instances()"); + + inst_list_init(&device_pool_list); + inst_list_init(&alloc_cap_list); + + if (!provider_is_responsible(broker, ref, &s)) + goto out; + + conn = lv_connect(_BROKER, &s); + if (conn == NULL) + goto out; + + for (i = 0; device_pool_names[i]; i++) { + s = get_pool_by_type(broker, + conn, + device_pool_names[i], + NAMESPACE(ref), + &device_pool_list); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error fetching device pools"); + goto out; + } + } + + for (i = 0; i < device_pool_list.cur; i++) { + inst = get_typed_instance(broker, + "AllocationCapabilities", + NAMESPACE(ref)); + if (inst == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get alloc_cap instance"); + goto out; + } + + s = cu_copy_prop(broker, device_pool_list.list[i], inst, + "InstanceID", NULL); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error copying InstanceID"); + goto out; + } + + s = cu_copy_prop(broker, device_pool_list.list[i], inst, + "ResourceType", NULL); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error copying InstanceID"); + goto out; + } + + inst_list_add(&alloc_cap_list, inst); + } + + if (names_only) + cu_return_instance_names(results, &alloc_cap_list); + else + cu_return_instances(results, &alloc_cap_list); + + out: + inst_list_free(&alloc_cap_list); + inst_list_free(&device_pool_list); return s; } @@ -95,8 +178,23 @@ static CMPIStatus GetInstance(CMPIInstan return return_alloc_cap(reference, results, 0); } -DEFAULT_EI(); -DEFAULT_EIN(); +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return alloc_cap_instances(_BROKER, reference, results, true, NULL); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + return alloc_cap_instances(_BROKER, reference, results, false, properties); +} + DEFAULT_CI(); DEFAULT_MI(); DEFAULT_DI();

3 5

[PATCH] Fix cu_return_foo calls to match new signature
by Jay Gagnon 20 Nov '07

20 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1195507146 18000 # Node ID 79f43a4ffc38d7227e17432b971639ae20f6f6ed # Parent e3b63f17f18169dbd41ef979a86e56b46d8a9ae9 Fix cu_return_foo calls to match new signature. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r e3b63f17f181 -r 79f43a4ffc38 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Mon Nov 19 11:15:49 2007 -0800 +++ b/src/Virt_ComputerSystem.c Mon Nov 19 16:19:06 2007 -0500 @@ -356,9 +356,9 @@ static CMPIStatus return_enum_domains(co } if (names_only) - cu_return_instance_names(results, list.list); + cu_return_instance_names(results, &list); else - cu_return_instances(results, list.list); + cu_return_instances(results, &list); CMSetStatus(&s, CMPI_RC_OK); diff -r e3b63f17f181 -r 79f43a4ffc38 src/Virt_Device.c --- a/src/Virt_Device.c Mon Nov 19 11:15:49 2007 -0800 +++ b/src/Virt_Device.c Mon Nov 19 16:19:06 2007 -0500 @@ -366,9 +366,9 @@ static CMPIStatus enum_devices(const CMP goto out; if (names_only) - cu_return_instance_names(results, list.list); + cu_return_instance_names(results, &list); else - cu_return_instances(results, list.list); + cu_return_instances(results, &list); inst_list_free(&list); diff -r e3b63f17f181 -r 79f43a4ffc38 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Mon Nov 19 11:15:49 2007 -0800 +++ b/src/Virt_DevicePool.c Mon Nov 19 16:19:06 2007 -0500 @@ -602,9 +602,9 @@ static void __return_pool(const CMPIResu bool name_only) { if (name_only) - cu_return_instance_names(results, list->list); + cu_return_instance_names(results, list); else - cu_return_instances(results, list->list); + cu_return_instances(results, list); } static CMPIStatus return_pool(const CMPIObjectPath *ref,

2 3

[PATCH 00 of 27] Fix uses of get_typed_*()
by Dan Smith 20 Nov '07

20 Nov '07

This is a huge set that changes the semantics of get_typed_class() and get_typed_instance() to take a reference class name for proper typing. I have only smoke-tested it, but it fixes several issues with returning incorrectly-typed instances that I know of. A healthy amount of testing would be appreciated :)

3 29

[PATCH 00 of 12] Finish out the conversion to classname connections
by Dan Smith 20 Nov '07

20 Nov '07

This fixes the remaining uses of lv_connect() (except for ComputerSystemIndication, which I'll deal with later). A quick poke seems to indicate that things still work, but testing would be good. Next, I will work on get_typed_instance(), which also needs a per-classname change so that we don't return Xen_foo instances for non-xen cases. There are also a lot of fixes needed to prevent classes from returning instances for the incorrect platform. These would be any that don't depend on a valid libvirt connection for their work.

3 17

[PATCH] [RFC] Change interface of cu_return_instance{, name}s
by Dan Smith 20 Nov '07

20 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195505862 28800 # Node ID f2c751be5069df9eb23a8bdbaafd5d55b3fd24e9 # Parent 25497386647b6e757ed5c8893f2a4c648543829b [RFC] Change interface of cu_return_instance{,name}s to use instance lists instead of null-terminated arrays. These functions existed before we had instance lists, and need to be updated. This will require another wide-sweeping (but trivial) change to libvirt-cim Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 25497386647b -r f2c751be5069 instance_util.c --- a/instance_util.c Mon Nov 19 08:00:42 2007 -0800 +++ b/instance_util.c Mon Nov 19 12:57:42 2007 -0800 @@ -24,15 +24,15 @@ #include "libcmpiutil.h" unsigned int cu_return_instances(const CMPIResult *results, - CMPIInstance ** const list) + const struct inst_list *list) { unsigned int i; if (list == NULL) return 0; - for (i = 0; list[i] != NULL; i++) - CMReturnInstance(results, list[i]); + for (i = 0; i < list->cur; i++) + CMReturnInstance(results, list->list[i]); return i; } @@ -54,19 +54,17 @@ bool cu_return_instance_name(const CMPIR } unsigned int cu_return_instance_names(const CMPIResult *results, - CMPIInstance ** const list) + const struct inst_list *list) { unsigned int i; - unsigned int c = 0; if (list == NULL) return 0; - for (i = 0; list[i] != NULL; i++) - if (cu_return_instance_name(results, list[i])) - c++; + for (i = 0; i < list->cur; i++) + cu_return_instance_name(results, list->list[i]); - return c; + return i; } static bool _compare_data(const CMPIData *a, const CMPIData *b) diff -r 25497386647b -r f2c751be5069 libcmpiutil.h --- a/libcmpiutil.h Mon Nov 19 08:00:42 2007 -0800 +++ b/libcmpiutil.h Mon Nov 19 12:57:42 2007 -0800 @@ -139,15 +139,18 @@ int cu_get_u16_path(const CMPIObjectPath const char *key, uint16_t *target); +/* Forward declaration */ +struct inst_list; + /** * Return a list of instances * - * @param list A NULL-terminated list of instances * @param results The result list to populate + * @param list A list of instances to return * @returns The number of instances returned */ unsigned int cu_return_instances(const CMPIResult *results, - CMPIInstance ** const list); + const struct inst_list *list); /** * Return an instance object path @@ -163,13 +166,12 @@ bool cu_return_instance_name(const CMPIR /** * Return the object paths of a list of instances * - * @param list A NULL-terminated list of instances * @param results The result list to populate - * @param op The object path + * @param list A list of instances to return (names of) * @returns The number of instance names returned */ unsigned int cu_return_instance_names(const CMPIResult *results, - CMPIInstance ** const list); + const struct inst_list *list); /** * Get a string property of an instance diff -r 25497386647b -r f2c751be5069 std_association.c --- a/std_association.c Mon Nov 19 08:00:42 2007 -0800 +++ b/std_association.c Mon Nov 19 12:57:42 2007 -0800 @@ -217,9 +217,9 @@ static CMPIStatus do_assoc(struct std_as } if (names_only) - cu_return_instance_names(results, list.list); + cu_return_instance_names(results, &list); else - cu_return_instances(results, list.list); + cu_return_instances(results, &list); out: inst_list_free(&list);

2 2

[PATCH] Removing pre-existing parse InstanceID function (parse_instance_id()). This function should have been used instead of writing a new one, however, it doesn't support NULL parameters for the prefix and the local_id
by Kaitlin Rupert 20 Nov '07

20 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1195499749 28800 # Node ID a38c8fc56e5787d3cadde11cccba37cbfc6926ac # Parent f3e1a5e15e27a2014a9fc382a40d74d476eaa76d Removing pre-existing parse InstanceID function (parse_instance_id()). This function should have been used instead of writing a new one, however, it doesn't support NULL parameters for the prefix and the local_id. Also replacing any calls to parse_instance_id() and replaced with parse_instanceid(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r f3e1a5e15e27 -r a38c8fc56e57 libxkutil/misc_util.c --- a/libxkutil/misc_util.c Mon Nov 19 10:08:54 2007 -0800 +++ b/libxkutil/misc_util.c Mon Nov 19 11:15:49 2007 -0800 @@ -155,29 +155,6 @@ bool match_pn_to_cn(const char *pn, cons return result; } -int parse_instance_id(char *_iid, char **orgid, char **locid) -{ - char *iid = NULL; - char *delim = NULL; - int ret = 0; - - iid = strdup(_iid); - - delim = strchr(iid, ':'); - if (!delim) { - free(iid); - goto out; - } - - *delim = '\0'; - *orgid = iid; - *locid = strdup(delim+1); - - ret = 1; - out: - return ret; -} - static const char *prefix_from_uri(const char *uri) { if (strstr(uri, "xen")) diff -r f3e1a5e15e27 -r a38c8fc56e57 src/Virt_VSSD.c --- a/src/Virt_VSSD.c Mon Nov 19 10:08:54 2007 -0800 +++ b/src/Virt_VSSD.c Mon Nov 19 11:15:49 2007 -0800 @@ -223,23 +223,12 @@ static CMPIStatus GetInstance(CMPIInstan { CMPIStatus s; CMPIInstance *inst; - char *iid; - char *orgid; char *locid; - iid = cu_get_str_path(reference, "InstanceID"); - if (iid == NULL) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "InstanceID not specified"); - return s; - } - - if (!parse_instance_id(iid, &orgid, &locid)) { - CMSetStatusWithChars(_BROKER, &s, - CMPI_RC_ERR_FAILED, + if (!parse_instanceid(reference, NULL, &locid)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, "Invalid InstanceID specified"); - free(iid); return s; } @@ -249,8 +238,6 @@ static CMPIStatus GetInstance(CMPIInstan CMSetStatus(&s, CMPI_RC_OK); - free(iid); - free(orgid); free(locid); return s;

2 1

[PATCH] Add STD_InstanceMIStub to avoid warnings during compile time
by Heidi Eckhart 20 Nov '07

20 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195471122 -3600 # Node ID 4a0c7a2052a8da4062177a29d5bd02c6b5a551d1 # Parent 18403e085eaab25596f65d3273ad56befeb46463 Add STD_InstanceMIStub to avoid warnings during compile time Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 18403e085eaa -r 4a0c7a2052a8 libcmpiutil.h --- a/libcmpiutil.h Fri Nov 16 08:49:15 2007 -0800 +++ b/libcmpiutil.h Mon Nov 19 12:18:42 2007 +0100 @@ -464,6 +464,52 @@ const char *cu_compare_ref(const CMPIObj const CMPIContext *ctx) \ { return; } +/** + * Generates the function table and initialization stub for an + * instance provider. + * @param pfx The prefix for all mandatory association provider + * functions. + * @param pn The provider name under which this provider is + * registered. + * @param broker The CMPIBroker pointer. + * @param hook Perform additional initialization functions. + * @return The function table of this instance provider. + */ +#define STD_InstanceMIStub(pfx, pn, broker, hook) \ + static CMPIInstanceMIFT instMIFT__={ \ + CMPICurrentVersion, \ + CMPICurrentVersion, \ + "instance" #pn, \ + pfx##Cleanup, \ + pfx##EnumInstanceNames, \ + pfx##EnumInstances, \ + pfx##GetInstance, \ + pfx##CreateInstance, \ + pfx##ModifyInstance, \ + pfx##DeleteInstance, \ + pfx##ExecQuery, \ + }; \ + \ + CMPIInstanceMI * \ + pn##_Create_InstanceMI(const CMPIBroker *, \ + const CMPIContext *, \ + CMPIStatus *rc); \ + \ + \ + CMPI_EXTERN_C \ + CMPIInstanceMI* pn##_Create_InstanceMI(const CMPIBroker* brkr, \ + const CMPIContext *ctx, \ + CMPIStatus *rc) \ + { \ + static CMPIInstanceMI mi={ \ + NULL, \ + &instMIFT__, \ + }; \ + broker=brkr; \ + hook; \ + return &mi; \ + } + #endif /*

2 2