6:29 a.m.
Renamed the device_type_by_classname() to res_type_by_device_classname() for consistency
with other interfaces.
Diff to patch set 1:
- moved adoption of new resource types CIM_RES_TYPE_foo into separate patch set
6:29 a.m.
New subject: [PATCH 1 of 3] Device: rename device_type_from_classname to res_type_from_device_classname
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204892346 -3600
# Node ID 8254cdd50092090275d925319e125651f6a133a8
# Parent d24e8fe2d358588a2d3a6484111806e1986d90fa
Device: rename device_type_from_classname to res_type_from_device_classname
for consistency with the other providers.
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r d24e8fe2d358 -r 8254cdd50092 src/Virt_Device.c
--- a/src/Virt_Device.c Fri Mar 07 13:19:05 2008 +0100
+++ b/src/Virt_Device.c Fri Mar 07 13:19:06 2008 +0100
@@ -268,7 +268,7 @@ static CMPIInstance *device_instance(con
return instance;
}
-uint16_t device_type_from_classname(const char *classname)
+uint16_t res_type_from_device_classname(const char *classname)
{
if (strstr(classname, "NetworkPort"))
return CIM_RES_TYPE_NET;
@@ -408,7 +408,7 @@ static CMPIStatus return_enum_devices(co
inst_list_init(&list);
s = enum_devices(_BROKER, reference, NULL,
- device_type_from_classname(CLASSNAME(reference)),
+ res_type_from_device_classname(CLASSNAME(reference)),
&list);
if (s.rc != CMPI_RC_OK)
goto out;
@@ -552,7 +552,7 @@ CMPIStatus get_device_by_ref(const CMPIB
s = get_device_by_name(broker,
reference,
name,
- device_type_from_classname(CLASSNAME(reference)),
+ res_type_from_device_classname(CLASSNAME(reference)),
&inst);
if (s.rc != CMPI_RC_OK)
goto out;
diff -r d24e8fe2d358 -r 8254cdd50092 src/Virt_Device.h
--- a/src/Virt_Device.h Fri Mar 07 13:19:05 2008 +0100
+++ b/src/Virt_Device.h Fri Mar 07 13:19:06 2008 +0100
@@ -69,7 +69,7 @@ CMPIStatus get_device_by_name(const CMPI
const uint16_t type,
CMPIInstance **_inst);
-uint16_t device_type_from_classname(const char *classname);
+uint16_t res_type_from_device_classname(const char *classname);
#endif
6:29 a.m.
New subject: [PATCH 2 of 3] SDS: adopt renamed Device function
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204892347 -3600
# Node ID e0dc4edf60115ef41e5c093b4dc65c6ff0ac1faa
# Parent 8254cdd50092090275d925319e125651f6a133a8
SDS: adopt renamed Device function
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 8254cdd50092 -r e0dc4edf6011 src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c Fri Mar 07 13:19:06 2008 +0100
+++ b/src/Virt_SettingsDefineState.c Fri Mar 07 13:19:07 2008 +0100
@@ -64,7 +64,7 @@ static CMPIStatus dev_to_rasd(const CMPI
s = get_rasd_by_name(_BROKER,
ref,
name,
- device_type_from_classname(CLASSNAME(ref)),
+ res_type_from_device_classname(CLASSNAME(ref)),
NULL,
&inst);
if (s.rc != CMPI_RC_OK)
6:29 a.m.
New subject: [PATCH 3 of 3] EAFP: adopt renamed Device function
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204892347 -3600
# Node ID 83f78e06e6495634dd8e5a02cda2755e27cf654c
# Parent e0dc4edf60115ef41e5c093b4dc65c6ff0ac1faa
EAFP: adopt renamed Device function
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r e0dc4edf6011 -r 83f78e06e649 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c Fri Mar 07 13:19:07 2008 +0100
+++ b/src/Virt_ElementAllocatedFromPool.c Fri Mar 07 13:19:07 2008 +0100
@@ -40,24 +40,6 @@
const static CMPIBroker *_BROKER;
-static uint16_t class_to_type(const CMPIObjectPath *ref)
-{
- uint16_t type;
-
- if (CMClassPathIsA(_BROKER, ref, "CIM_LogicalDisk", NULL))
- type = CIM_RES_TYPE_DISK;
- else if (CMClassPathIsA(_BROKER, ref, "CIM_NetworkPort", NULL))
- type = CIM_RES_TYPE_NET;
- else if (CMClassPathIsA(_BROKER, ref, "CIM_Memory", NULL))
- type = CIM_RES_TYPE_MEM;
- else if (CMClassPathIsA(_BROKER, ref, "CIM_Processor", NULL))
- type = CIM_RES_TYPE_PROC;
- else
- type = 0;
-
- return type;
-}
-
static CMPIStatus vdev_to_pool(const CMPIObjectPath *ref,
struct std_assoc_info *info,
struct inst_list *list)
@@ -76,7 +58,7 @@ static CMPIStatus vdev_to_pool(const CMP
if (s.rc != CMPI_RC_OK)
goto out;
- type = class_to_type(ref);
+ type = res_type_from_device_classname(CLASSNAME(ref));
if (type == CIM_RES_TYPE_UNKNOWN) {
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_FAILED,
12:16 p.m.
Heidi Eckhart wrote:
Renamed the device_type_by_classname() to
res_type_by_device_classname() for consistency with other interfaces.
Diff to patch set 1:
- moved adoption of new resource types CIM_RES_TYPE_foo into separate patch set
Looks good. +1 This is dependent on some of the other previous
patchsets, but once those go in, I think this should be good too.
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com
6086
days inactive
6086
days old
4 comments
2 participants
participants (2)
-
Heidi Eckhart -
Kaitlin Rupert