admin: Add URI support and introduce virAdmGetDefaultURI

Since virt-admin should be able to connect to various admin servers
on hosted different daemons, we need to provide URI support to
libvirt-admin.

diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h
index 411bd891bfdf150a0489c0687205e4cdd3a1d2c6..d22d24770c09d56171175cf3ad1bfe285a5e957f 100644 (file)
--- a/include/libvirt/libvirt-admin.h
+++ b/include/libvirt/libvirt-admin.h
@@ -59,6 +59,7 @@ int virAdmConnectIsAlive(virAdmConnectPtr conn);
 
 int virAdmGetVersion(unsigned long long *libVer);
 
+char *virAdmConnectGetURI(virAdmConnectPtr conn);
 
 # ifdef __cplusplus
 }

diff --git a/src/datatypes.c b/src/datatypes.c
index 12bcfc196310e6632c85dca537123141e5b5ae47..aeac3018ecedf48899cf7ad182d0ced0abc3f0e2 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -832,4 +832,6 @@ virAdmConnectDispose(void *obj)
 
     if (conn->privateDataFreeFunc)
         conn->privateDataFreeFunc(conn);
+
+    virURIFree(conn->uri);
 }

diff --git a/src/datatypes.h b/src/datatypes.h
index be108fe6c2e5c55b8491db81bcc86928aa443b8a..b16bdb196cf0103c3dc04abdd01b884d861db829 100644 (file)
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -397,6 +397,7 @@ struct _virConnect {
  */
 struct _virAdmConnect {
     virObjectLockable object;
+    virURIPtr uri;
 
     void *privateData;
     virFreeCallback privateDataFreeFunc;

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 1556cd3c31d13d57f575e91312a1357782e33a50..a0f4ebc06e41dbebb303cb805f28cfb6047e815d 100644 (file)
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -27,6 +27,7 @@
 #include "configmake.h"
 
 #include "viralloc.h"
+#include "virconf.h"
 #include "virlog.h"
 #include "virnetclient.h"
 #include "virobject.h"
@@ -95,60 +96,54 @@ virAdmInitialize(void)
 }
 
 static char *
-getSocketPath(const char *name)
+getSocketPath(virURIPtr uri)
 {
     char *rundir = virGetUserRuntimeDirectory();
     char *sock_path = NULL;
     size_t i = 0;
-    virURIPtr uri = NULL;
 
-    if (name) {
-        if (!(uri = virURIParse(name)))
-            goto error;
+    if (!uri)
+        goto cleanup;
 
-        if (STRNEQ(uri->scheme, "admin") ||
-            uri->server || uri->user || uri->fragment) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Invalid connection name '%s'"), name);
-            goto error;
-        }
 
-        for (i = 0; i < uri->paramsCount; i++) {
-            virURIParamPtr param = &uri->params[i];
+    for (i = 0; i < uri->paramsCount; i++) {
+        virURIParamPtr param = &uri->params[i];
 
-            if (STREQ(param->name, "socket")) {
-                VIR_FREE(sock_path);
-                if (VIR_STRDUP(sock_path, param->value) < 0)
-                    goto error;
-            } else {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("Unknown URI parameter '%s'"), param->name);
+        if (STREQ(param->name, "socket")) {
+            VIR_FREE(sock_path);
+            if (VIR_STRDUP(sock_path, param->value) < 0)
                 goto error;
-            }
+        } else {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("Unknown URI parameter '%s'"), param->name);
+            goto error;
         }
     }
 
     if (!sock_path) {
-        if (!uri || !uri->path || STREQ(uri->path, "/system")) {
+        if (STRNEQ(uri->scheme, "libvirtd")) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("Unsupported URI scheme '%s'"),
+                           uri->scheme);
+            goto error;
+        }
+        if (STREQ_NULLABLE(uri->path, "/system")) {
             if (VIR_STRDUP(sock_path, LIBVIRTD_ADMIN_UNIX_SOCKET) < 0)
                 goto error;
         } else if (STREQ_NULLABLE(uri->path, "/session")) {
-            if (!rundir)
-                goto error;
-
-            if (virAsprintf(&sock_path,
-                            "%s%s", rundir, LIBVIRTD_ADMIN_SOCK_NAME) < 0)
+            if (!rundir || virAsprintf(&sock_path, "%s%s", rundir,
+                                       LIBVIRTD_ADMIN_SOCK_NAME) < 0)
                 goto error;
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Invalid URI path '%s'"), uri->path);
+                           _("Invalid URI path '%s', try '/system'"),
+                           uri->path ? uri->path : "");
             goto error;
         }
     }
 
  cleanup:
     VIR_FREE(rundir);
-    virURIFree(uri);
     return sock_path;
 
  error:
@@ -156,6 +151,37 @@ getSocketPath(const char *name)
     goto cleanup;
 }
 
+static const char *
+virAdmGetDefaultURI(virConfPtr conf)
+{
+    virConfValuePtr value = NULL;
+    const char *uristr = NULL;
+
+    uristr = virGetEnvAllowSUID("LIBVIRT_ADMIN_DEFAULT_URI");
+    if (uristr && *uristr) {
+        VIR_DEBUG("Using LIBVIRT_ADMIN_DEFAULT_URI '%s'", uristr);
+    } else if ((value = virConfGetValue(conf, "admin_uri_default"))) {
+        if (value->type != VIR_CONF_STRING) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Expected a string for 'admin_uri_default' config "
+                             "parameter"));
+            return NULL;
+        }
+
+        VIR_DEBUG("Using config file uri '%s'", value->str);
+        uristr = value->str;
+    } else {
+        /* Since we can't probe connecting via any hypervisor driver as libvirt
+         * does, if no explicit URI was given and neither the environment
+         * variable, nor the configuration parameter had previously been set,
+         * we set the default admin server URI to 'libvirtd://system'.
+         */
+        uristr = "libvirtd:///system";
+    }
+
+    return uristr;
+}
+
 /**
  * virAdmConnectOpen:
  * @name: uri of the daemon to connect to, NULL for default
@@ -170,6 +196,7 @@ virAdmConnectOpen(const char *name, unsigned int flags)
 {
     char *sock_path = NULL;
     virAdmConnectPtr conn = NULL;
+    virConfPtr conf = NULL;
 
     if (virAdmInitialize() < 0)
         goto error;
@@ -180,7 +207,16 @@ virAdmConnectOpen(const char *name, unsigned int flags)
     if (!(conn = virAdmConnectNew()))
         goto error;
 
-    if (!(sock_path = getSocketPath(name)))
+    if (virConfLoadConfig(&conf, "libvirt-admin.conf") < 0)
+        goto error;
+
+    if (!name && !(name = virAdmGetDefaultURI(conf)))
+        goto error;
+
+    if (!(conn->uri = virURIParse(name)))
+        goto error;
+
+    if (!(sock_path = getSocketPath(conn->uri)))
         goto error;
 
     if (!(conn->privateData = remoteAdminPrivNew(sock_path)))
@@ -193,6 +229,7 @@ virAdmConnectOpen(const char *name, unsigned int flags)
 
  cleanup:
     VIR_FREE(sock_path);
+    virConfFree(conf);
     return conn;
 
  error:
@@ -340,3 +377,30 @@ virAdmConnectIsAlive(virAdmConnectPtr conn)
 
     return ret;
 }
+
+/**
+ * virAdmConnectGetURI:
+ * @conn: pointer to an admin connection
+ *
+ * String returned by this method is normally the same as the string passed
+ * to the virAdmConnectOpen. Even if NULL was passed to virAdmConnectOpen,
+ * this method returns a non-null URI string.
+ *
+ * Returns an URI string related to the connection or NULL in case of an error.
+ * Caller is responsible for freeing the string.
+ */
+char *
+virAdmConnectGetURI(virAdmConnectPtr conn)
+{
+    char *uri = NULL;
+    VIR_DEBUG("conn=%p", conn);
+
+    virResetLastError();
+
+    virCheckAdmConnectReturn(conn, NULL);
+
+    if (!(uri = virURIFormat(conn->uri)))
+        virDispatchError(NULL);
+
+    return uri;
+}

diff --git a/src/libvirt.conf b/src/libvirt.conf
index 016cd242e5d4a5f174c19975e6f02096412ed0d4..a6e16ae1534c6be5a796e25eb45cd078619344e1 100644 (file)
--- a/src/libvirt.conf
+++ b/src/libvirt.conf
@@ -12,7 +12,8 @@
 #]
 
 #
-# This can be used to prevent probing of the hypervisor
-# driver when no URI is supplied by the application.
-
+# These can be used in cases when no URI is supplied by the application
+# (@uri_default also prevents probing of the hypervisor driver).
+#
 #uri_default = "qemu:///system"
+#uri_default_admin = "libvirtd:///system"

diff --git a/src/libvirt_admin_public.syms b/src/libvirt_admin_public.syms
index 0a70bc7f4c10c356dd209487d7777cf8ba651863..6f5fcea8420a14763c3acd6dbacd24b6a69fd4da 100644 (file)
--- a/src/libvirt_admin_public.syms
+++ b/src/libvirt_admin_public.syms
@@ -17,4 +17,5 @@ LIBVIRT_ADMIN_1.3.0 {
         virAdmConnectRef;
         virAdmGetVersion;
         virAdmConnectIsAlive;
+        virAdmConnectGetURI;
 };

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 2cfa1b1e00529d131868f266562aba170f9e7973..3ba52aede38b4dbde9ec49f9368bc7eeae4cb1d1 100644 (file)
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -113,6 +113,39 @@ vshAdmReconnect(vshControl *ctl)
     priv->wantReconnect = false;
 }
 
+/*
+ * 'uri' command
+ */
+
+static const vshCmdInfo info_uri[] = {
+    {.name = "help",
+     .data = N_("print the admin server URI")
+    },
+    {.name = "desc",
+     .data = ""
+    },
+    {.name = NULL}
+};
+
+static bool
+cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
+{
+    char *uri;
+    vshAdmControlPtr priv = ctl->privData;
+
+    uri = virAdmConnectGetURI(priv->conn);
+    if (!uri) {
+        vshError(ctl, "%s", _("failed to get URI"));
+        return false;
+    }
+
+    vshPrint(ctl, "%s\n", uri);
+    VIR_FREE(uri);
+
+    return true;
+}
+
+
 /* ---------------
  * Command Connect
  * ---------------
@@ -425,6 +458,12 @@ static const vshCmdDef vshAdmCmds[] = {
     VSH_CMD_HELP,
     VSH_CMD_PWD,
     VSH_CMD_QUIT,
+    {.name = "uri",
+     .handler = cmdURI,
+     .opts = NULL,
+     .info = info_uri,
+     .flags = 0
+    },
     {.name = "connect",
      .handler = cmdConnect,
      .opts = opts_connect,