6:20 a.m.
Created separate patch set for new resource types CIM_RES_TYPE_foo and affected
providers.
6:20 a.m.
New subject: [PATCH 1 of 7] Add Resource Pool types to svpc_types.h
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204889405 -3600
# Node ID f7afada7979c0d7e9a3c9084bc2a0f0f785e7ccc
# Parent 0a71dab025defa9d32488753ead9c47a582134df
Add Resource Pool types to svpc_types.h
This patch reorganizes the resource types. It defines common
resource types for:
- ALL
- PROC
- MEM
- NET
- DISK
- UNKNOWN
and maps the corresponding class specific resource types to
these base types.
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 0a71dab025de -r f7afada7979c libxkutil/device_parsing.h
--- a/libxkutil/device_parsing.h Thu Mar 06 09:59:23 2008 +0800
+++ b/libxkutil/device_parsing.h Fri Mar 07 12:30:05 2008 +0100
@@ -64,11 +64,11 @@ struct graphics_device {
struct virt_device {
enum {
- VIRT_DEV_NET = CIM_RASD_TYPE_NET,
- VIRT_DEV_DISK = CIM_RASD_TYPE_DISK,
- VIRT_DEV_MEM = CIM_RASD_TYPE_MEM,
- VIRT_DEV_VCPU = CIM_RASD_TYPE_PROC,
- VIRT_DEV_UNKNOWN = 1000,
+ VIRT_DEV_NET = CIM_RES_TYPE_NET,
+ VIRT_DEV_DISK = CIM_RES_TYPE_DISK,
+ VIRT_DEV_MEM = CIM_RES_TYPE_MEM,
+ VIRT_DEV_VCPU = CIM_RES_TYPE_PROC,
+ VIRT_DEV_UNKNOWN = CIM_RES_TYPE_UNKNOWN,
VIRT_DEV_EMU,
VIRT_DEV_GRAPHICS,
} type;
diff -r 0a71dab025de -r f7afada7979c src/svpc_types.h
--- a/src/svpc_types.h Thu Mar 06 09:59:23 2008 +0800
+++ b/src/svpc_types.h Fri Mar 07 12:30:05 2008 +0100
@@ -22,10 +22,12 @@
#ifndef __SVPC_TYPES_H
#define __SVPC_TYPES_H
-#define CIM_RASD_TYPE_PROC 3
-#define CIM_RASD_TYPE_MEM 4
-#define CIM_RASD_TYPE_NET 10
-#define CIM_RASD_TYPE_DISK 17
+#define CIM_RES_TYPE_ALL 0
+#define CIM_RES_TYPE_PROC 3
+#define CIM_RES_TYPE_MEM 4
+#define CIM_RES_TYPE_NET 10
+#define CIM_RES_TYPE_DISK 17
+#define CIM_RES_TYPE_UNKNOWN 1000
#define CIM_VSSD_RECOVERY_NONE 2
#define CIM_VSSD_RECOVERY_RESTART 3
10:19 a.m.
New subject: [PATCH 1 of 7] Add Resource Pool types to svpc_types.h
HE> diff -r 0a71dab025de -r f7afada7979c libxkutil/device_parsing.h
HE> --- a/libxkutil/device_parsing.h Thu Mar 06 09:59:23 2008 +0800
HE> +++ b/libxkutil/device_parsing.h Fri Mar 07 12:30:05 2008 +0100
HE> @@ -64,11 +64,11 @@ struct graphics_device {
HE> struct virt_device {
HE> enum {
HE> - VIRT_DEV_NET = CIM_RASD_TYPE_NET,
HE> - VIRT_DEV_DISK = CIM_RASD_TYPE_DISK,
HE> - VIRT_DEV_MEM = CIM_RASD_TYPE_MEM,
HE> - VIRT_DEV_VCPU = CIM_RASD_TYPE_PROC,
HE> - VIRT_DEV_UNKNOWN = 1000,
HE> + VIRT_DEV_NET = CIM_RES_TYPE_NET,
HE> + VIRT_DEV_DISK = CIM_RES_TYPE_DISK,
HE> + VIRT_DEV_MEM = CIM_RES_TYPE_MEM,
HE> + VIRT_DEV_VCPU = CIM_RES_TYPE_PROC,
HE> + VIRT_DEV_UNKNOWN = CIM_RES_TYPE_UNKNOWN,
HE> VIRT_DEV_EMU,
HE> VIRT_DEV_GRAPHICS,
HE> } type;
I have applied this set to avoid dragging this out any further, but I
would like to see a follow-on set that removes all of the VIRT_DEV_foo
types in favor of CIM_RES_TYPE_foo.
--
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms(a)us.ibm.com
3:58 a.m.
New subject: [PATCH 1 of 7] Add Resource Pool types to svpc_types.h
Dan Smith wrote:
I have applied this set to avoid dragging this out any further, but
I
would like to see a follow-on set that removes all of the VIRT_DEV_foo
types in favor of CIM_RES_TYPE_foo.
Thanks. I will send out this follow on patch soon.
--
Regards
Heidi Eckhart
Software Engineer
IBM Linux Technology Center - Open Hypervisor
10:46 a.m.
New subject: [PATCH 1 of 7] Add Resource Pool types to svpc_types.h
diff -r 0a71dab025de -r f7afada7979c libxkutil/device_parsing.h
--- a/libxkutil/device_parsing.h Thu Mar 06 09:59:23 2008 +0800
+++ b/libxkutil/device_parsing.h Fri Mar 07 12:30:05 2008 +0100
@@ -64,11 +64,11 @@ struct graphics_device {
struct virt_device {
enum {
- VIRT_DEV_NET = CIM_RASD_TYPE_NET,
- VIRT_DEV_DISK = CIM_RASD_TYPE_DISK,
- VIRT_DEV_MEM = CIM_RASD_TYPE_MEM,
- VIRT_DEV_VCPU = CIM_RASD_TYPE_PROC,
- VIRT_DEV_UNKNOWN = 1000,
+ VIRT_DEV_NET = CIM_RES_TYPE_NET,
+ VIRT_DEV_DISK = CIM_RES_TYPE_DISK,
+ VIRT_DEV_MEM = CIM_RES_TYPE_MEM,
+ VIRT_DEV_VCPU = CIM_RES_TYPE_PROC,
+ VIRT_DEV_UNKNOWN = CIM_RES_TYPE_UNKNOWN,
VIRT_DEV_EMU,
VIRT_DEV_GRAPHICS,
This set applied and test fine on my system.
I'm guessing the VIRT_DEV_* pieces were left here so that this set could
be applied without breaking providers that still use VIRT_DEV_*.
I think this set is good to go as long as the VIRT_DEV_* enum is cleaned
up once all the references to VIRT_DEV_* are removed.
Thoughts?
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com
6:20 a.m.
New subject: [PATCH 2 of 7] RASD: update resource types to CIM_RES_TYPE_foo
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204889425 -3600
# Node ID 2e63d5e4b7ceaa42080e83df97794099fcb5b682
# Parent f7afada7979c0d7e9a3c9084bc2a0f0f785e7ccc
RASD: update resource types to CIM_RES_TYPE_foo
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r f7afada7979c -r 2e63d5e4b7ce src/Virt_RASD.c
--- a/src/Virt_RASD.c Fri Mar 07 12:30:05 2008 +0100
+++ b/src/Virt_RASD.c Fri Mar 07 12:30:25 2008 +0100
@@ -292,17 +292,17 @@ static CMPIInstance *rasd_from_vdev(cons
char *base;
char *id;
- if (dev->type == VIRT_DEV_DISK) {
- type = CIM_RASD_TYPE_DISK;
+ if (dev->type == CIM_RES_TYPE_DISK) {
+ type = CIM_RES_TYPE_DISK;
base = "DiskResourceAllocationSettingData";
- } else if (dev->type == VIRT_DEV_NET) {
- type = CIM_RASD_TYPE_NET;
+ } else if (dev->type == CIM_RES_TYPE_NET) {
+ type = CIM_RES_TYPE_NET;
base = "NetResourceAllocationSettingData";
- } else if (dev->type == VIRT_DEV_VCPU) {
- type = CIM_RASD_TYPE_PROC;
+ } else if (dev->type == CIM_RES_TYPE_PROC) {
+ type = CIM_RES_TYPE_PROC;
base = "ProcResourceAllocationSettingData";
- } else if (dev->type == VIRT_DEV_MEM) {
- type = CIM_RASD_TYPE_MEM;
+ } else if (dev->type == CIM_RES_TYPE_MEM) {
+ type = CIM_RES_TYPE_MEM;
base = "MemResourceAllocationSettingData";
} else {
return NULL;
@@ -329,7 +329,7 @@ static CMPIInstance *rasd_from_vdev(cons
CMSetProperty(inst, "ResourceType",
(CMPIValue *)&type, CMPI_uint16);
- if (dev->type == VIRT_DEV_DISK) {
+ if (dev->type == CIM_RES_TYPE_DISK) {
CMSetProperty(inst,
"VirtualDevice",
(CMPIValue *)dev->dev.disk.virtual_dev,
@@ -338,12 +338,12 @@ static CMPIInstance *rasd_from_vdev(cons
"Address",
(CMPIValue *)dev->dev.disk.source,
CMPI_chars);
- } else if (dev->type == VIRT_DEV_NET) {
+ } else if (dev->type == CIM_RES_TYPE_NET) {
CMSetProperty(inst,
"NetworkType",
(CMPIValue *)dev->dev.disk.type,
CMPI_chars);
- } else if (dev->type == VIRT_DEV_MEM) {
+ } else if (dev->type == CIM_RES_TYPE_MEM) {
const char *units = "MegaBytes";
CMSetProperty(inst, "AllocationUnits",
@@ -354,7 +354,7 @@ static CMPIInstance *rasd_from_vdev(cons
(CMPIValue *)&dev->dev.mem.size, CMPI_uint64);
CMSetProperty(inst, "Limit",
(CMPIValue *)&dev->dev.mem.maxsize, CMPI_uint64);
- } else if (dev->type == VIRT_DEV_VCPU) {
+ } else if (dev->type == CIM_RES_TYPE_PROC) {
proc_rasd_from_vdev(broker, dev, host, ref, inst);
}
@@ -470,13 +470,13 @@ CMPIrc rasd_type_from_classname(const ch
goto out;
if (STREQ(base, "DiskResourceAllocationSettingData"))
- *type = CIM_RASD_TYPE_DISK;
+ *type = CIM_RES_TYPE_DISK;
else if (STREQ(base, "NetResourceAllocationSettingData"))
- *type = CIM_RASD_TYPE_NET;
+ *type = CIM_RES_TYPE_NET;
else if (STREQ(base, "ProcResourceAllocationSettingData"))
- *type = CIM_RASD_TYPE_PROC;
+ *type = CIM_RES_TYPE_PROC;
else if (STREQ(base, "MemResourceAllocationSettingData"))
- *type = CIM_RASD_TYPE_MEM;
+ *type = CIM_RES_TYPE_MEM;
else
goto out;
@@ -493,16 +493,16 @@ CMPIrc rasd_classname_from_type(uint16_t
CMPIrc rc = CMPI_RC_OK;
switch(type) {
- case CIM_RASD_TYPE_MEM:
+ case CIM_RES_TYPE_MEM:
*classname = "MemResourceAllocationSettingData";
break;
- case CIM_RASD_TYPE_PROC:
+ case CIM_RES_TYPE_PROC:
*classname = "ProcResourceAllocationSettingData";
break;
- case CIM_RASD_TYPE_NET:
+ case CIM_RES_TYPE_NET:
*classname = "NetResourceAllocationSettingData";
break;
- case CIM_RASD_TYPE_DISK:
+ case CIM_RES_TYPE_DISK:
*classname = "DiskResourceAllocationSettingData";
break;
default:
@@ -522,10 +522,10 @@ static CMPIStatus _enum_rasds(const CMPI
int i, j;
uint16_t type;
CMPIStatus s;
- uint16_t types[] = {CIM_RASD_TYPE_PROC,
- CIM_RASD_TYPE_DISK,
- CIM_RASD_TYPE_NET,
- CIM_RASD_TYPE_MEM,
+ uint16_t types[] = {CIM_RES_TYPE_PROC,
+ CIM_RES_TYPE_DISK,
+ CIM_RES_TYPE_NET,
+ CIM_RES_TYPE_MEM,
0};
conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s);
6:20 a.m.
New subject: [PATCH 3 of 7] VSMS: update resource types to CIM_RES_TYPE_foo
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204889442 -3600
# Node ID 2bdfefe566d0c6eb60a70de3dd57caf75a9154d0
# Parent 2e63d5e4b7ceaa42080e83df97794099fcb5b682
VSMS: update resource types to CIM_RES_TYPE_foo
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 2e63d5e4b7ce -r 2bdfefe566d0 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c Fri Mar 07 12:30:25 2008 +0100
+++ b/src/Virt_VirtualSystemManagementService.c Fri Mar 07 12:30:42 2008 +0100
@@ -231,7 +231,7 @@ static int rasd_to_vdev(CMPIInstance *in
if (!parse_fq_devid(id, &name, &devid))
goto err;
- if (type == VIRT_DEV_DISK) {
+ if (type == CIM_RES_TYPE_DISK) {
free(dev->dev.disk.virtual_dev);
dev->dev.disk.virtual_dev = devid;
@@ -241,7 +241,7 @@ static int rasd_to_vdev(CMPIInstance *in
free(dev->dev.disk.source);
dev->dev.disk.source = strdup(val);
dev->dev.disk.disk_type = disk_type_from_file(val);
- } else if (type == VIRT_DEV_NET) {
+ } else if (type == CIM_RES_TYPE_NET) {
free(dev->dev.net.mac);
dev->dev.net.mac = devid;
@@ -253,7 +253,7 @@ static int rasd_to_vdev(CMPIInstance *in
CU_DEBUG("Unknown class type for net device: %s",
CLASSNAME(op));
- } else if (type == VIRT_DEV_MEM) {
+ } else if (type == CIM_RES_TYPE_MEM) {
cu_get_u64_prop(inst, "VirtualQuantity",
&dev->dev.mem.size);
cu_get_u64_prop(inst, "Reservation",
&dev->dev.mem.size);
dev->dev.mem.maxsize = dev->dev.mem.size;
@@ -307,16 +307,16 @@ static int classify_resources(CMPIArray
CMPI_RC_OK)
return 0;
- if (type == CIM_RASD_TYPE_PROC)
+ if (type == CIM_RES_TYPE_PROC)
rasd_to_vdev(item.value.inst,
&domain->dev_vcpu[domain->dev_vcpu_ct++]);
- else if (type == CIM_RASD_TYPE_MEM)
+ else if (type == CIM_RES_TYPE_MEM)
rasd_to_vdev(item.value.inst,
&domain->dev_mem[domain->dev_mem_ct++]);
- else if (type == CIM_RASD_TYPE_DISK)
+ else if (type == CIM_RES_TYPE_DISK)
rasd_to_vdev(item.value.inst,
&domain->dev_disk[domain->dev_disk_ct++]);
- else if (type == CIM_RASD_TYPE_NET)
+ else if (type == CIM_RES_TYPE_NET)
rasd_to_vdev(item.value.inst,
&domain->dev_net[domain->dev_net_ct++]);
}
@@ -613,16 +613,16 @@ static struct virt_device **find_list(st
{
struct virt_device **list = NULL;
- if (type == VIRT_DEV_NET) {
+ if (type == CIM_RES_TYPE_NET) {
list = &dominfo->dev_net;
*count = &dominfo->dev_net_ct;
- } else if (type == VIRT_DEV_DISK) {
+ } else if (type == CIM_RES_TYPE_DISK) {
list = &dominfo->dev_disk;
*count = &dominfo->dev_disk_ct;
- } else if (type == VIRT_DEV_VCPU) {
+ } else if (type == CIM_RES_TYPE_PROC) {
list = &dominfo->dev_vcpu;
*count = &dominfo->dev_vcpu_ct;
- } else if (type == VIRT_DEV_MEM) {
+ } else if (type == CIM_RES_TYPE_MEM) {
list = &dominfo->dev_mem;
*count = &dominfo->dev_mem_ct;
}
@@ -713,7 +713,7 @@ static CMPIStatus resource_del(struct do
goto out;
_list = find_list(dominfo, type, &count);
- if ((type == CIM_RASD_TYPE_MEM) || (_list != NULL))
+ if ((type == CIM_RES_TYPE_MEM) || (_list != NULL))
list = *_list;
else {
cu_statusf(_BROKER, &s,
@@ -734,7 +734,7 @@ static CMPIStatus resource_del(struct do
dev,
RESOURCE_DEL,
CLASSNAME(op));
- dev->type = VIRT_DEV_UNKNOWN;
+ dev->type = CIM_RES_TYPE_UNKNOWN;
break;
}
}
@@ -760,7 +760,7 @@ static CMPIStatus resource_add(struct do
goto out;
_list = find_list(dominfo, type, &count);
- if ((type == CIM_RASD_TYPE_MEM) || (_list == NULL)) {
+ if ((type == CIM_RES_TYPE_MEM) || (_list == NULL)) {
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_FAILED,
"Cannot add resources of type %" PRIu16, type);
6:20 a.m.
New subject: [PATCH 4 of 7] DevicePool: update resource types to CIM_RES_TYPE_foo
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204889601 -3600
# Node ID f5c3736d2a13c4fcd8bf09afb04e69efff4040f3
# Parent 2bdfefe566d0c6eb60a70de3dd57caf75a9154d0
DevicePool: update resource types to CIM_RES_TYPE_foo
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 2bdfefe566d0 -r f5c3736d2a13 src/Virt_DevicePool.c
--- a/src/Virt_DevicePool.c Fri Mar 07 12:30:42 2008 +0100
+++ b/src/Virt_DevicePool.c Fri Mar 07 12:33:21 2008 +0100
@@ -318,13 +318,13 @@ char *pool_member_of(const CMPIBroker *b
{
char *poolid = NULL;
- if (type == CIM_RASD_TYPE_PROC)
+ if (type == CIM_RES_TYPE_PROC)
poolid = strdup("ProcessorPool/0");
- else if (type == CIM_RASD_TYPE_MEM)
+ else if (type == CIM_RES_TYPE_MEM)
poolid = strdup("MemoryPool/0");
- else if (type == CIM_RASD_TYPE_NET)
+ else if (type == CIM_RES_TYPE_NET)
poolid = netpool_member_of(broker, id, refcn);
- else if (type == CIM_RASD_TYPE_DISK)
+ else if (type == CIM_RES_TYPE_DISK)
poolid = diskpool_member_of(broker, id, refcn);
else
return NULL;
@@ -335,15 +335,15 @@ uint16_t device_type_from_poolid(const c
uint16_t device_type_from_poolid(const char *id)
{
if (STARTS_WITH(id, "NetworkPool"))
- return VIRT_DEV_NET;
+ return CIM_RES_TYPE_NET;
else if (STARTS_WITH(id, "DiskPool"))
- return VIRT_DEV_DISK;
+ return CIM_RES_TYPE_DISK;
else if (STARTS_WITH(id, "MemoryPool"))
- return VIRT_DEV_MEM;
+ return CIM_RES_TYPE_MEM;
else if (STARTS_WITH(id, "ProcessorPool"))
- return VIRT_DEV_VCPU;
+ return CIM_RES_TYPE_PROC;
else
- return VIRT_DEV_UNKNOWN;
+ return CIM_RES_TYPE_UNKNOWN;
}
static bool mempool_set_total(CMPIInstance *inst, virConnectPtr conn)
@@ -412,7 +412,7 @@ static CMPIStatus mempool_instance(virCo
const CMPIBroker *broker)
{
const char *id = "MemoryPool/0";
- uint16_t type = CIM_RASD_TYPE_MEM;
+ uint16_t type = CIM_RES_TYPE_MEM;
CMPIInstance *inst;
CMPIStatus s = {CMPI_RC_OK, NULL};
@@ -450,7 +450,7 @@ static CMPIStatus procpool_instance(virC
const CMPIBroker *broker)
{
const char *id = "ProcessorPool/0";
- uint16_t type = CIM_RASD_TYPE_PROC;
+ uint16_t type = CIM_RES_TYPE_PROC;
CMPIInstance *inst;
CMPIStatus s = {CMPI_RC_OK, NULL};
@@ -489,7 +489,7 @@ static CMPIStatus _netpool_for_network(s
{
char *str = NULL;
char *bridge = NULL;
- uint16_t type = CIM_RASD_TYPE_NET;
+ uint16_t type = CIM_RES_TYPE_NET;
CMPIInstance *inst;
virNetworkPtr network = NULL;
@@ -595,7 +595,7 @@ static CMPIInstance *diskpool_from_path(
{
CMPIInstance *inst;
char *poolid = NULL;
- const uint16_t type = CIM_RASD_TYPE_DISK;
+ const uint16_t type = CIM_RES_TYPE_DISK;
struct statvfs vfs;
uint64_t cap;
uint64_t res;
6:20 a.m.
New subject: [PATCH 5 of 7] SDC: update resource types to CIM_RES_TYPE_foo
# HG changeset patch
# User Heidi Eckhart <heidieck(a)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(a)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");
6:20 a.m.
New subject: [PATCH 6 of 7] VSSDC: update resource types to CIM_RES_TYPE_foo
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204889729 -3600
# Node ID 47492fa1262e7a6cb29d0b354c268ae85f608b3c
# Parent 6940fcabd3325336a18ae5d1b84af2954054b69e
VSSDC: update resource types to CIM_RES_TYPE_foo
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 6940fcabd332 -r 47492fa1262e src/Virt_VSSDComponent.c
--- a/src/Virt_VSSDComponent.c Fri Mar 07 12:35:06 2008 +0100
+++ b/src/Virt_VSSDComponent.c Fri Mar 07 12:35:29 2008 +0100
@@ -45,10 +45,10 @@ static CMPIStatus vssd_to_rasd(const CMP
char *name = NULL;
int i = 0;
int types[] = {
- CIM_RASD_TYPE_PROC,
- CIM_RASD_TYPE_NET,
- CIM_RASD_TYPE_DISK,
- CIM_RASD_TYPE_MEM,
+ CIM_RES_TYPE_PROC,
+ CIM_RES_TYPE_NET,
+ CIM_RES_TYPE_DISK,
+ CIM_RES_TYPE_MEM,
-1
};
6:20 a.m.
New subject: [PATCH 7 of 7] EAFP: update resource types to CIM_RES_TYPE_foo
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204889797 -3600
# Node ID 105355b94770df20100a25b6c1c7d9c9dc47aa14
# Parent 47492fa1262e7a6cb29d0b354c268ae85f608b3c
EAFP: update resource types to CIM_RES_TYPE_foo
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 47492fa1262e -r 105355b94770 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c Fri Mar 07 12:35:29 2008 +0100
+++ b/src/Virt_ElementAllocatedFromPool.c Fri Mar 07 12:36:37 2008 +0100
@@ -45,13 +45,13 @@ static uint16_t class_to_type(const CMPI
uint16_t type;
if (CMClassPathIsA(_BROKER, ref, "CIM_LogicalDisk", NULL))
- type = CIM_RASD_TYPE_DISK;
+ type = CIM_RES_TYPE_DISK;
else if (CMClassPathIsA(_BROKER, ref, "CIM_NetworkPort", NULL))
- type = CIM_RASD_TYPE_NET;
+ type = CIM_RES_TYPE_NET;
else if (CMClassPathIsA(_BROKER, ref, "CIM_Memory", NULL))
- type = CIM_RASD_TYPE_MEM;
+ type = CIM_RES_TYPE_MEM;
else if (CMClassPathIsA(_BROKER, ref, "CIM_Processor", NULL))
- type = CIM_RASD_TYPE_PROC;
+ type = CIM_RES_TYPE_PROC;
else
type = 0;
6130
days inactive
6133
days old
10 comments
3 participants
participants (3)
-
Dan Smith -
Heidi Eckhart -
Kaitlin Rupert