[Libvirt-cim] [PATCH 1 of 7] Add Resource Pool types to svpc_types.h

[Heidi Eckhart]

# HG changeset patch
# User Heidi Eckhart <heidieck at linux.vnet.ibm.com>
# Date 1204709615 -3600
# Node ID 1626d88fa98b890ba251a450fca3d6c330bc27ad
# Parent  58da2f9d92e39567b75d8537a833aba0da994f92
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 at linux.vnet.ibm.com>

diff -r 58da2f9d92e3 -r 1626d88fa98b libxkutil/device_parsing.h
--- a/libxkutil/device_parsing.h	Mon Mar 03 09:58:19 2008 -0800
+++ b/libxkutil/device_parsing.h	Wed Mar 05 10:33:35 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 58da2f9d92e3 -r 1626d88fa98b src/svpc_types.h
--- a/src/svpc_types.h	Mon Mar 03 09:58:19 2008 -0800
+++ b/src/svpc_types.h	Wed Mar 05 10:33:35 2008 +0100
@@ -22,10 +22,24 @@
 #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_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_RASD_TYPE_PROC      CIM_RES_TYPE_PROC
+#define CIM_RASD_TYPE_MEM       CIM_RES_TYPE_MEM
+#define CIM_RASD_TYPE_NET       CIM_RES_TYPE_NET
+#define CIM_RASD_TYPE_DISK      CIM_RES_TYPE_DISK
+
+#define CIM_POOL_TYPE_ALL       CIM_TYPE_ALL
+#define CIM_POOL_TYPE_PROC      CIM_RES_TYPE_PROC
+#define CIM_POOL_TYPE_MEM       CIM_RES_TYPE_MEM
+#define CIM_POOL_TYPE_NET       CIM_RES_TYPE_NET
+#define CIM_POOL_TYPE_DISK      CIM_RES_TYPE_DISK
+#define CIM_POOL_TYPE_UNKNOWN   CIM_RES_TYPE_UNKNOWN
 
 #define CIM_VSSD_RECOVERY_NONE       2
 #define CIM_VSSD_RECOVERY_RESTART    3