[Libvirt-cim] [PATCH 2 of 2] Remove incorrectly-placed ValueRole/ValueRange in RASDs from AC::SDC
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1209667697 25200
# Node ID 122027a2c63e875939492ec0c7f39299ca6fed25
# Parent db6526d1cb9c15334a73c25ab6e5fb511855013a
Remove incorrectly-placed ValueRole/ValueRange in RASDs from AC::SDC
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r db6526d1cb9c -r 122027a2c63e src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Thu May 01 11:48:15 2008 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c Thu May 01 11:48:17 2008 -0700
@@ -856,10 +856,6 @@ static CMPIInstance *sdc_rasd_inst(const
const char *inst_id = NULL;
const char *base = NULL;
uint16_t resource_type;
- /* Defaults for the following are from
- CIM_SettingsDefineCapabilities.mof. */
- uint16_t policy = SDC_POLICY_INDEPENDENT;
- uint16_t role = SDC_ROLE_SUPPORTED;
switch(type) {
case SDC_RASD_MIN:
@@ -867,29 +863,24 @@ static CMPIInstance *sdc_rasd_inst(const
goto out;
prop_list = rasd->min(ref, s);
inst_id = "Minimum";
- range = SDC_RANGE_MIN;
break;
case SDC_RASD_MAX:
if (rasd->max == NULL)
goto out;
prop_list = rasd->max(ref, s);
inst_id = "Maximum";
- range = SDC_RANGE_MAX;
break;
case SDC_RASD_INC:
if (rasd->inc == NULL)
goto out;
prop_list = rasd->inc(ref, s);
inst_id = "Increment";
- range = SDC_RANGE_INC;
break;
case SDC_RASD_DEF:
if (rasd->def == NULL)
goto out;
prop_list = rasd->def(ref, s);
inst_id = "Default";
- role = SDC_ROLE_DEFAULT;
- range = SDC_RANGE_POINT;
break;
default:
cu_statusf(broker, s,
@@ -913,9 +904,6 @@ static CMPIInstance *sdc_rasd_inst(const
NAMESPACE(ref));
CMSetProperty(inst, "InstanceID", inst_id, CMPI_chars);
- CMSetProperty(inst, "PropertyPolicy", &policy, CMPI_uint16);
- CMSetProperty(inst, "ValueRole", &role, CMPI_uint16);
- CMSetProperty(inst, "ValueRange", &range, CMPI_uint16);
resource_type = rasd->resource_type;
CMSetProperty(inst, "ResourceType", &resource_type, CMPI_uint16);