[Libvirt-cim] [PATCH 5 of 7] SDC: update resource types to CIM_RES_TYPE_foo

[Heidi Eckhart]

# HG changeset patch
# User Heidi Eckhart <heidieck at linux.vnet.ibm.com>
# Date 1204889706 -3600
# Node ID 6940fcabd3325336a18ae5d1b84af2954054b69e
# Parent  f5c3736d2a13c4fcd8bf09afb04e69efff4040f3
SDC: update resource types to CIM_RES_TYPE_foo
Signed-off-by: Heidi Eckhart <heidieck at linux.vnet.ibm.com>

diff -r f5c3736d2a13 -r 6940fcabd332 src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c	Fri Mar 07 12:33:21 2008 +0100
+++ b/src/Virt_SettingsDefineCapabilities.c	Fri Mar 07 12:35:06 2008 +0100
@@ -614,7 +614,7 @@ static struct sdc_rasd_prop *disk_inc(co
 }
 
 static struct sdc_rasd mem = {
-        .resource_type = CIM_RASD_TYPE_MEM,
+        .resource_type = CIM_RES_TYPE_MEM,
         .min = mem_min,
         .max = mem_max,
         .def = mem_def,
@@ -622,7 +622,7 @@ static struct sdc_rasd mem = {
 };
 
 static struct sdc_rasd processor = {
-         .resource_type = CIM_RASD_TYPE_PROC,
+         .resource_type = CIM_RES_TYPE_PROC,
          .min = proc_min,
          .max = proc_max,
          .def = proc_def,
@@ -630,7 +630,7 @@ static struct sdc_rasd processor = {
 };
 
 static struct sdc_rasd network = {
-        .resource_type = CIM_RASD_TYPE_NET,
+        .resource_type = CIM_RES_TYPE_NET,
         .min = net_min,
         .max = net_max,
         .def = net_def,
@@ -638,7 +638,7 @@ static struct sdc_rasd network = {
 };
 
 static struct sdc_rasd disk = {
-        .resource_type = CIM_RASD_TYPE_DISK,
+        .resource_type = CIM_RES_TYPE_DISK,
         .min = disk_min,
         .max = disk_max,
         .def = disk_def,
@@ -807,7 +807,7 @@ static CMPIStatus alloc_cap_to_rasd(cons
 
         CU_DEBUG("ResourceType: %hi", type);
 
-        if (type == VIRT_DEV_UNKNOWN) {
+        if (type == CIM_RES_TYPE_UNKNOWN) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Unable to determine resource type");