[Libvirt-cim] [PATCH 3 of 5] SDS: adopt interface changes of RASD

25 Feb 2008

# HG changeset patch
# User Heidi Eckhart <heidieck@linux.vnet.ibm.com>
# Date 1203934433 -3600
# Node ID 50360523c174c877639dbc2100fd5723b2193226
# Parent  fdda40f15fcfd38c50a8918ad1075714e19efa7a
SDS: adopt interface changes of RASD
Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com>

diff -r fdda40f15fcf -r 50360523c174 src/Virt_SettingsDefineState.c

--- a/src/Virt_SettingsDefineState.c	Mon Feb 25 11:13:50 2008 +0100
+++ b/src/Virt_SettingsDefineState.c	Mon Feb 25 11:13:53 2008 +0100
@@ -159,6 +159,7 @@ static CMPIStatus rasd_to_dev(const CMPI
 {
         CMPIStatus s = {CMPI_RC_OK, NULL};
         CMPIInstance *dev = NULL;
+        CMPIInstance *inst = NULL;
         const char *id = NULL;
         uint16_t type;
 
@@ -178,6 +179,10 @@ static CMPIStatus rasd_to_dev(const CMPI
                            "Missing ResourceType");
                 goto out;
         }
+        
+        s = get_rasd_by_name(_BROKER, ref, id, type, &inst);
+        if (s.rc != CMPI_RC_OK)
+                goto out;
 
         dev = _get_typed_device(id, type, ref, &s);
         if (dev == NULL)
@@ -185,9 +190,6 @@ static CMPIStatus rasd_to_dev(const CMPI
 
         inst_list_add(list, dev);
 
-        cu_statusf(_BROKER, &s,
-                   CMPI_RC_OK,
-                   "");
  out:
         return s;
 }

    