[Libvirt-cim] [PATCH 4 of 4] Add support for creating disk pools to RPCS

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1238776732 25200
# Node ID d08b52d4da57fc8bbe946f8b4f9ddccdccf9dee6
# Parent  2bd3982a2285fbfb5287861cfecb1a70e0fe4b43
Add support for creating disk pools to RPCS

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 2bd3982a2285 -r d08b52d4da57 src/Virt_ResourcePoolConfigurationService.c
--- a/src/Virt_ResourcePoolConfigurationService.c	Fri Apr 03 09:38:52 2009 -0700
+++ b/src/Virt_ResourcePoolConfigurationService.c	Fri Apr 03 09:38:52 2009 -0700
@@ -40,6 +40,16 @@
 
 const char *DEF_POOL_NAME = "libvirt-cim-pool";
 
+/*
+ *  * Right now, detect support and use it, if available.
+ *   * Later, this can be a configure option if needed
+ *    */
+#if LIBVIR_VERSION_NUMBER > 4000
+# define VIR_USE_LIBVIRT_STORAGE 1
+#else
+# define VIR_USE_LIBVIRT_STORAGE 0
+#endif
+
 static CMPIStatus create_child_pool_parse_args(const CMPIArgs *argsin,
                                                const char **name,
                                                CMPIArray **set,
@@ -104,6 +114,40 @@
 
 }
 
+#if VIR_USE_LIBVIRT_STORAGE
+static const char *disk_rasd_to_pool(CMPIInstance *inst,
+                                    struct virt_pool *pool,
+                                    const char *ns)
+{
+        const char *val = NULL;
+        const char *msg = NULL;
+        uint16_t type;
+
+        if (cu_get_u16_prop(inst, "Type", &type) != CMPI_RC_OK)
+                return "Missing `Type' property";
+
+        if (type != DISK_POOL_DIR)
+                return "Storage pool type not supported";
+
+        pool->pool_info.disk.pool_type = type;
+
+        if (cu_get_str_prop(inst, "Path", &val) != CMPI_RC_OK)
+                return "Missing `Path' property";
+
+        pool->pool_info.disk.path = strdup(val);
+
+        return msg;
+
+}
+#else
+static const char *disk_rasd_to_pool(CMPIInstance *inst,
+                                    struct virt_pool *pool,
+                                    const char *ns)
+{
+        return "Storage pool creation not supported in this version of libvirt";
+}
+#endif
+
 static const char *rasd_to_vpool(CMPIInstance *inst,
                                  struct virt_pool *pool,
                                  uint16_t type,
@@ -113,6 +157,8 @@
 
         if (type == CIM_RES_TYPE_NET) {
                 return net_rasd_to_pool(inst, pool, ns);
+        } else if (type == CIM_RES_TYPE_DISK) {
+                return disk_rasd_to_pool(inst, pool, ns);
         }
 
         pool->type = CIM_RES_TYPE_UNKNOWN;
@@ -150,9 +196,6 @@
         if (res_type_from_rasd_classname(CLASSNAME(op), &type) != CMPI_RC_OK)
                 return "Unable to determine resource type";
 
-        if (type != CIM_RES_TYPE_NET)
-                return "Only network pools currently supported";
-
         msg = rasd_to_vpool(inst, pool, type, NAMESPACE(op));
 
         return msg;