# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1203702667 28800
# Node ID 743b306e9bc680cab97c2afb60dfe9547e1d182c
# Parent 2bff66d74872c62ef38fca81fafd32f0d7fb126a
Update providers that call rasd_for_domain() and get_rasd_instance().
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 2bff66d74872 -r 743b306e9bc6 src/Virt_ElementSettingData.c
--- a/src/Virt_ElementSettingData.c Fri Feb 22 09:49:38 2008 -0800
+++ b/src/Virt_ElementSettingData.c Fri Feb 22 09:51:07 2008 -0800
@@ -98,7 +98,7 @@ static CMPIStatus rasd_to_rasd(const CMP
/* Special association case:
* RASD instance is pointing to itself
*/
- s = get_rasd_by_ref(_BROKER, ref, &inst);
+ s = get_rasd_by_ref(_BROKER, ref, info->properties, &inst);
if (s.rc != CMPI_RC_OK)
goto out;
diff -r 2bff66d74872 -r 743b306e9bc6 src/Virt_ResourceAllocationFromPool.c
--- a/src/Virt_ResourceAllocationFromPool.c Fri Feb 22 09:49:38 2008 -0800
+++ b/src/Virt_ResourceAllocationFromPool.c Fri Feb 22 09:51:07 2008 -0800
@@ -66,7 +66,7 @@ static CMPIStatus rasd_to_pool(const CMP
goto out;
}
- s = get_rasd_by_name(_BROKER, ref, id, type, &inst);
+ s = get_rasd_by_name(_BROKER, ref, id, type, NULL, &inst);
if (s.rc != CMPI_RC_OK)
goto out;
@@ -138,6 +138,7 @@ static int rasds_from_pool(uint16_t type
static int rasds_from_pool(uint16_t type,
const CMPIObjectPath *ref,
const char *poolid,
+ const char **properties,
struct inst_list *list)
{
CMPIStatus s;
@@ -164,6 +165,7 @@ static int rasds_from_pool(uint16_t type
name,
type,
ref,
+ properties,
&tmp);
filter_by_pool(list, &tmp, poolid);
@@ -213,6 +215,7 @@ static CMPIStatus pool_to_rasd(const CMP
rasds_from_pool(type,
ref,
poolid,
+ info->properties,
list);
cu_statusf(_BROKER, &s,
diff -r 2bff66d74872 -r 743b306e9bc6 src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c Fri Feb 22 09:49:38 2008 -0800
+++ b/src/Virt_SettingsDefineState.c Fri Feb 22 09:51:07 2008 -0800
@@ -98,6 +98,7 @@ static CMPIStatus dev_to_rasd(const CMPI
name,
device_type_from_classname(CLASSNAME(ref)),
ref,
+ info->properties,
&rasds);
rasd = find_rasd(&rasds, id);
@@ -180,7 +181,7 @@ static CMPIStatus rasd_to_dev(const CMPI
goto out;
}
- s = get_rasd_by_name(_BROKER, ref, id, type, &inst);
+ s = get_rasd_by_name(_BROKER, ref, id, type, NULL, &inst);
if (s.rc != CMPI_RC_OK)
goto out;
diff -r 2bff66d74872 -r 743b306e9bc6 src/Virt_VSSDComponent.c
--- a/src/Virt_VSSDComponent.c Fri Feb 22 09:49:38 2008 -0800
+++ b/src/Virt_VSSDComponent.c Fri Feb 22 09:51:07 2008 -0800
@@ -66,6 +66,7 @@ static CMPIStatus vssd_to_rasd(const CMP
name,
types[i],
ref,
+ info->properties,
list);
}
diff -r 2bff66d74872 -r 743b306e9bc6 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c Fri Feb 22 09:49:38 2008 -0800
+++ b/src/Virt_VirtualSystemManagementService.c Fri Feb 22 09:51:07 2008 -0800
@@ -1041,7 +1041,7 @@ static CMPIStatus rasd_refs_to_insts(con
continue;
}
- s = get_rasd_by_name(_BROKER, reference, id, type, &inst);
+ s = get_rasd_by_name(_BROKER, reference, id, type, NULL, &inst);
if (s.rc != CMPI_RC_OK)
continue;