[Libvirt-cim] [PATCH 01 of 27] Change the behavior of get_typed_{instance, class}()

[Dan Smith]

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1195496688 28800
# Node ID b1d53e304e5dc88a3f57b303838926d31c8f0a7e
# Parent  e1423289fc1dfd4b326c2d79c715ad1246be1cfa
Change the behavior of get_typed_{instance,class}()
so that they take a proper prefix.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r e1423289fc1d -r b1d53e304e5d libxkutil/misc_util.c
--- a/libxkutil/misc_util.c	Mon Nov 19 09:38:22 2007 -0800
+++ b/libxkutil/misc_util.c	Mon Nov 19 10:24:48 2007 -0800
@@ -178,43 +178,6 @@ int parse_instance_id(char *_iid, char *
         return ret;
 }
 
-static const char *prefix_from_uri(const char *uri)
-{
-        if (strstr(uri, "xen"))
-                return "Xen";
-        else if (strstr(uri, "qemu"))
-                return "KVM";
-        else
-                return NULL;
-}
-
-static bool is_xen(void)
-{
-        return access("/proc/xen/privcmd", R_OK) == 0;
-}
-
-static bool is_kvm(void)
-{
-        return access("/sys/module/kvm", R_OK) == 0;
-}
-
-static bool is_user(void)
-{
-        return getenv(URI_ENV) != NULL;
-}
-
-static const char *default_prefix(void)
-{
-        if (is_user())
-                return prefix_from_uri(getenv(URI_ENV));
-        else if (is_xen())
-                return "Xen";
-        else if (is_kvm())
-                return "KVM";
-        else
-                return NULL;
-}
-
 uint64_t allocated_memory(virConnectPtr conn)
 {
         virDomainPtr *list;
@@ -241,24 +204,61 @@ uint64_t allocated_memory(virConnectPtr 
         return memory;
 }
 
+const char *pfx_from_conn(virConnectPtr conn)
+{
+        char *uri;
+        const char *pfx = "Xen";
+
+        uri = virConnectGetURI(conn);
+        if (uri == NULL)
+                return pfx; /* Default/Error case */
+
+        CU_DEBUG("URI of connection is: %s", uri);
+
+        if (STARTS_WITH(uri, "xen"))
+                pfx = "Xen";
+        else if (STARTS_WITH(uri, "qemu"))
+                pfx = "KVM";
+
+        free(uri);
+
+        return pfx;
+}
+
+char *get_typed_class(const char *refcn, const char *new_base)
+{
+        char *class = NULL;
+        char *pfx;
+
+        if (strchr(refcn, '_'))
+                pfx = class_prefix_name(refcn);
+        else
+                pfx = strdup(refcn);
+
+        if (pfx == NULL)
+                return NULL;
+
+        if (asprintf(&class, "%s_%s", pfx, new_base) == -1)
+                class = NULL;
+
+        free(pfx);
+
+        return class;
+}
+
 CMPIInstance *get_typed_instance(const CMPIBroker *broker,
+                                 const char *refcn,
                                  const char *base,
                                  const char *namespace)
 {
-        const char *prefix;
         char *new_cn;
         CMPIObjectPath *op;
         CMPIInstance *inst = NULL;
         CMPIStatus s;
 
-        prefix = default_prefix();
-        if (prefix == NULL)
-                goto out;
-
-        if (asprintf(&new_cn, "%s_%s", prefix, base) == -1) {
-                new_cn = NULL;
-                goto out;
-        }
+        new_cn = get_typed_class(refcn, base);
+        if (new_cn == NULL)
+                goto out;
 
         op = CMNewObjectPath(broker, namespace, new_cn, &s);
         if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op))
@@ -275,21 +275,6 @@ CMPIInstance *get_typed_instance(const C
         free(new_cn);
 
         return inst;
-}
-
-char *get_typed_class(const char *new_base)
-{
-        const char *pfx;
-        char *class = NULL;
-
-        pfx = default_prefix();
-        if (pfx == NULL)
-                return NULL;
-
-        if (asprintf(&class, "%s_%s", pfx, new_base) == -1)
-                class = NULL;
-
-        return class;
 }
 
 char *class_base_name(const char *classname)
@@ -305,27 +290,15 @@ char *class_base_name(const char *classn
 
 virConnectPtr lv_connect(const CMPIBroker *broker, CMPIStatus *s)
 {
-        const char *uri = NULL;
         virConnectPtr conn;
 
-        if (is_user())
-                uri = getenv(URI_ENV);
-        else if (is_xen())
-                uri = "xen";
-        else if (is_kvm())
-                uri = "qemu:///system";
-        else {
-                cu_statusf(broker, s,
-                           CMPI_RC_ERR_FAILED,
-                           "Unable to determine hypervisor type");
-                return NULL;
-        }
-
-        conn = virConnectOpen(uri);
+        /* This is going away, so just assume Xen for right now */
+
+        conn = virConnectOpen("xen");
         if (conn == NULL)
                 cu_statusf(broker, s,
                            CMPI_RC_ERR_FAILED,
-                           "Unable to connect to %s", uri);
+                           "Unable to connect to xen");
         else
                 CMSetStatus(s, CMPI_RC_OK);
 
diff -r e1423289fc1d -r b1d53e304e5d libxkutil/misc_util.h
--- a/libxkutil/misc_util.h	Mon Nov 19 09:38:22 2007 -0800
+++ b/libxkutil/misc_util.h	Mon Nov 19 10:24:48 2007 -0800
@@ -70,9 +70,13 @@ char *class_prefix_name(const char *clas
 char *class_prefix_name(const char *classname);
 char *class_base_name(const char *classname);
 
-/* Returns "%s_%s" % (prefix($classname), new_base) */
-char *get_typed_class(const char *new_base);
+/* Returns a class prefix based on the URI reported by conn */
+const char *pfx_from_conn(virConnectPtr conn);
+
+/* Returns "%s_%s" % (prefix($refcn), new_base) */
+char *get_typed_class(const char *refcn, const char *new_base);
 CMPIInstance *get_typed_instance(const CMPIBroker *broker,
+                                 const char *refcn,
                                  const char *base,
                                  const char *namespace);