[Libvirt-cim] [PATCH 3 of 3] EAFP: adopt Device interface changes
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204798889 -3600
# Node ID 6b9530915893f8531c90cb18eca9bf9a7dd091b7
# Parent 8bd960f2d01019ef77451322a11ee4c88ff12651
EAFP: adopt Device interface changes
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 8bd960f2d010 -r 6b9530915893 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c Thu Mar 06 11:21:28 2008 +0100
+++ b/src/Virt_ElementAllocatedFromPool.c Thu Mar 06 11:21:29 2008 +0100
@@ -77,7 +77,7 @@ static CMPIStatus vdev_to_pool(const CMP
goto out;
type = class_to_type(ref);
- if (type == 0) {
+ if (type == CIM_RES_TYPE_UNKNOWN) {
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_FAILED,
"Unknown device type");
@@ -138,47 +138,6 @@ static int filter_by_pool(struct inst_li
return dest->cur;
}
-static int devs_from_pool(uint16_t type,
- const CMPIObjectPath *ref,
- const char *poolid,
- struct inst_list *list)
-{
- CMPIStatus s;
- virConnectPtr conn = NULL;
- virDomainPtr *doms = NULL;
- int count;
- int i;
- const char *ns = NAMESPACE(ref);
- const char *cn = CLASSNAME(ref);
-
- conn = connect_by_classname(_BROKER, cn, &s);
- if (conn == NULL)
- return 0;
-
- count = get_domain_list(conn, &doms);
-
- for (i = 0; i < count; i++) {
- const char *name;
- struct inst_list tmp;
-
- inst_list_init(&tmp);
-
- name = virDomainGetName(doms[i]);
-
- dom_devices(_BROKER, doms[i], ns, type, &tmp);
-
- filter_by_pool(list, &tmp, type, poolid);
-
- inst_list_free(&tmp);
- virDomainFree(doms[i]);
- }
-
- free(doms);
- virConnectClose(conn);
-
- return count;
-}
-
static CMPIStatus pool_to_vdev(const CMPIObjectPath *ref,
struct std_assoc_info *info,
struct inst_list *list)
@@ -186,7 +145,8 @@ static CMPIStatus pool_to_vdev(const CMP
const char *poolid;
CMPIStatus s = {CMPI_RC_OK, NULL};
uint16_t type;
- CMPIInstance *inst;
+ CMPIInstance *inst = NULL;
+ struct inst_list tmp;
if (!match_hypervisor_prefix(ref, info))
return s;
@@ -210,7 +170,15 @@ static CMPIStatus pool_to_vdev(const CMP
goto out;
}
- devs_from_pool(type, ref, poolid, list);
+ inst_list_init(&tmp);
+
+ s = enum_devices(_BROKER, ref, NULL, type, &tmp);
+ if (s.rc != CMPI_RC_OK)
+ goto out;
+
+ filter_by_pool(list, &tmp, type, poolid);
+
+ inst_list_free(&tmp);
out:
return s;