[Libvirt-cim] [PATCH 5 of 5] ESD: adopt interface changes to RASD
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1203681292 -3600
# Node ID 6f70bca8f5caf8f7ff3eeaede8112dca27b3b072
# Parent d31116669eb24e1ff8691a33b4c1d5a91421fd20
ESD: adopt interface changes to RASD
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r d31116669eb2 -r 6f70bca8f5ca src/Virt_ElementSettingData.c
--- a/src/Virt_ElementSettingData.c Fri Feb 22 12:54:52 2008 +0100
+++ b/src/Virt_ElementSettingData.c Fri Feb 22 12:54:52 2008 +0100
@@ -63,38 +63,20 @@ static CMPIStatus rasd_to_rasd(const CMP
struct inst_list *list)
{
CMPIStatus s = {CMPI_RC_OK, NULL};
- CMPIInstance *inst;
- const char *id = NULL;
- uint16_t type;
+ CMPIInstance *inst = NULL;
if (!match_hypervisor_prefix(ref, info))
return s;
- if (cu_get_str_path(ref, "InstanceID", &id) != CMPI_RC_OK) {
- cu_statusf(_BROKER, &s,
- CMPI_RC_ERR_FAILED,
- "Missing InstanceID");
+ /* Special association case:
+ * RASD instance is pointing to itself
+ */
+ s = get_rasd_by_ref(_BROKER, ref, &inst);
+ if (s.rc != CMPI_RC_OK)
goto out;
- }
-
- if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) {
- cu_statusf(_BROKER, &s,
- CMPI_RC_ERR_FAILED,
- "Unable to determine RASD type");
- goto out;
- }
-
- inst = get_rasd_instance(info->context, ref, _BROKER, id, type);
- if (inst == NULL) {
- cu_statusf(_BROKER, &s,
- CMPI_RC_ERR_FAILED,
- "Error getting associated RASD");
-
- goto out;
- }
-
+
inst_list_add(list, inst);
-
+
out:
return s;
}