[Libvirt-cim] [PATCH 1 of 5] RASD: rename rasds_for_domain to enum_rasds and make it configurable
Heidi Eckhart
heidieck at linux.vnet.ibm.com
Fri Mar 7 12:28:20 UTC 2008
# HG changeset patch
# User Heidi Eckhart <heidieck at linux.vnet.ibm.com>
# Date 1204892343 -3600
# Node ID e50362c85943d1b567ad2c9d080d4d0767a85a99
# Parent 50f47a071fb1d4668a5eb1b3e0c649f87ce8f376
RASD: rename rasds_for_domain to enum_rasds and make it configurable
Signed-off-by: Heidi Eckhart <heidieck at linux.vnet.ibm.com>
diff -r 50f47a071fb1 -r e50362c85943 src/Virt_RASD.c
--- a/src/Virt_RASD.c Fri Mar 07 13:19:02 2008 +0100
+++ b/src/Virt_RASD.c Fri Mar 07 13:19:03 2008 +0100
@@ -439,8 +439,8 @@ CMPIStatus get_rasd_by_ref(const CMPIBro
goto out;
}
- if (rasd_type_from_classname(CLASSNAME(reference), &type) != CMPI_RC_OK) {
- cu_statusf(_BROKER, &s,
+ if (res_type_from_rasd_classname(CLASSNAME(reference), &type) != CMPI_RC_OK) {
+ cu_statusf(broker, &s,
CMPI_RC_ERR_FAILED,
"Unable to determine RASD type");
goto out;
@@ -460,7 +460,7 @@ CMPIStatus get_rasd_by_ref(const CMPIBro
return s;
}
-CMPIrc rasd_type_from_classname(const char *cn, uint16_t *type)
+CMPIrc res_type_from_rasd_classname(const char *cn, uint16_t *type)
{
char *base = NULL;
CMPIrc rc = CMPI_RC_ERR_FAILED;
@@ -512,58 +512,114 @@ CMPIrc rasd_classname_from_type(uint16_t
return rc;
}
-static CMPIStatus _enum_rasds(const CMPIObjectPath *ref,
+static CMPIStatus _get_rasds(const CMPIBroker *broker,
+ const CMPIObjectPath *reference,
+ const virDomainPtr dom,
+ const uint16_t type,
+ const char **properties,
+ struct inst_list *list)
+{
+ CMPIStatus s = {CMPI_RC_OK, NULL};
+ int count;
+ int i;
+ struct virt_device *devs = NULL;
+
+ count = get_devices(dom, &devs, type);
+ if (count <= 0)
+ goto out;
+
+ for (i = 0; i < count; i++) {
+ CMPIInstance *dev = NULL;
+ const char *host = NULL;
+
+ host = virDomainGetName(dom);
+ if (host == NULL) {
+ cleanup_virt_device(&devs[i]);
+ continue;
+ }
+
+ dev = rasd_from_vdev(broker,
+ &devs[i],
+ host,
+ reference,
+ properties);
+ if (dev)
+ inst_list_add(list, dev);
+
+ cleanup_virt_device(&devs[i]);
+ }
+
+ out:
+ free(devs);
+ return s;
+}
+
+static CMPIStatus _enum_rasds(const CMPIBroker *broker,
+ const CMPIObjectPath *reference,
+ const virDomainPtr dom,
+ const uint16_t type,
const char **properties,
struct inst_list *list)
{
+ CMPIStatus s;
+
+ if (type == CIM_RES_TYPE_ALL) {
+ s = _get_rasds(broker, reference, dom,
+ CIM_RES_TYPE_PROC,
+ properties, list);
+ s = _get_rasds(broker, reference, dom,
+ CIM_RES_TYPE_MEM,
+ properties, list);
+ s = _get_rasds(broker, reference, dom,
+ CIM_RES_TYPE_NET,
+ properties, list);
+ s = _get_rasds(broker, reference, dom,
+ CIM_RES_TYPE_DISK,
+ properties, list);
+ }
+ else
+ s = _get_rasds(broker, reference, dom,
+ type, properties, list);
+
+ return s;
+}
+
+CMPIStatus enum_rasds(const CMPIBroker *broker,
+ const CMPIObjectPath *ref,
+ const char *domain,
+ const uint16_t type,
+ const char **properties,
+ struct inst_list *list)
+{
virConnectPtr conn = NULL;
virDomainPtr *domains = NULL;
- int count;
- int i, j;
- uint16_t type;
- CMPIStatus s;
- uint16_t types[] = {CIM_RES_TYPE_PROC,
- CIM_RES_TYPE_DISK,
- CIM_RES_TYPE_NET,
- CIM_RES_TYPE_MEM,
- 0};
+ int count = 1;
+ int i;
+ CMPIStatus s = {CMPI_RC_OK, NULL};
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;
- }
+ goto out;
+
+ if (domain) {
+ domains = calloc(1, sizeof(virDomainPtr));
+ domains[0] = virDomainLookupByName(conn, domain);
+ }
+ else
+ count = get_domain_list(conn, &domains);
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,
- properties,
- list);
- }
+ _enum_rasds(broker,
+ ref,
+ domains[i],
+ type,
+ properties,
+ list);
virDomainFree(domains[i]);
}
- s = (CMPIStatus){CMPI_RC_OK, NULL};
-
out:
virConnectClose(conn);
- free(domains);
return s;
}
@@ -575,17 +631,23 @@ static CMPIStatus return_enum_rasds(cons
{
struct inst_list list;
CMPIStatus s;
+ uint16_t type;
inst_list_init(&list);
- s = _enum_rasds(ref, properties, &list);
- if (s.rc == CMPI_RC_OK) {
- if (names_only)
- cu_return_instance_names(results, &list);
- else
- cu_return_instances(results, &list);
- }
-
+ res_type_from_rasd_classname(CLASSNAME(ref), &type);
+
+ s = enum_rasds(_BROKER, ref, NULL,
+ type, properties, &list);
+ if (s.rc != CMPI_RC_OK)
+ goto out;
+
+ if (names_only)
+ cu_return_instance_names(results, &list);
+ else
+ cu_return_instances(results, &list);
+
+ out:
inst_list_free(&list);
return s;
@@ -626,41 +688,6 @@ static CMPIStatus GetInstance(CMPIInstan
out:
return s;
-}
-
-int rasds_for_domain(const CMPIBroker *broker,
- const char *name,
- const uint16_t type,
- const CMPIObjectPath *ref,
- const char **properties,
- struct inst_list *_list)
-{
- struct virt_device *list;
- int count;
- int i;
- virConnectPtr conn;
- CMPIStatus s;
-
- conn = connect_by_classname(broker, CLASSNAME(ref), &s);
- if (conn == NULL)
- return 0;
-
- count = list_devs(conn, type, name, &list);
-
- for (i = 0; i < count; i++) {
- CMPIInstance *inst;
-
- inst = rasd_from_vdev(broker, &list[i], name, ref, properties);
- if (inst != NULL)
- inst_list_add(_list, inst);
- }
-
- if (count > 0)
- cleanup_virt_devices(&list, count);
-
- virConnectClose(conn);
-
- return count;
}
DEFAULT_CI();
diff -r 50f47a071fb1 -r e50362c85943 src/Virt_RASD.h
--- a/src/Virt_RASD.h Fri Mar 07 13:19:02 2008 +0100
+++ b/src/Virt_RASD.h Fri Mar 07 13:19:03 2008 +0100
@@ -27,20 +27,20 @@ char *rasd_to_xml(CMPIInstance *rasd);
* Get a list of RASDs for a given domain
*
* @param broker The current broker
- * @param name The name of the domain in question
+ * @param ref Defines the libvirt connection to use
+ * @param domain The domain id (NULL means for all domains)
* @param type The ResourceType of the desired RASDs
- * @param ref A reference used for hypervisor connection and namespace
- * setting of the resulting instances
+ * @param properties The properties to filter for
* @param _list The list of instances to populate
*/
-int rasds_for_domain(const CMPIBroker *broker,
- const char *name,
- const uint16_t type,
- const CMPIObjectPath *ref,
- const char **properties,
- struct inst_list *_list);
+CMPIStatus enum_rasds(const CMPIBroker *broker,
+ const CMPIObjectPath *ref,
+ const char *domain,
+ const uint16_t type,
+ const char **properties,
+ struct inst_list *_list);
-CMPIrc rasd_type_from_classname(const char *cn, uint16_t *type);
+CMPIrc res_type_from_rasd_classname(const char *cn, uint16_t *type);
CMPIrc rasd_classname_from_type(uint16_t type, const char **cn);
CMPIStatus get_rasd_by_name(const CMPIBroker *broker,
More information about the Libvirt-cim
mailing list