admin: Introduce virAdmConnectSetLoggingOutputs

Enable libvirt users to modify daemon's logging output settings from outside.
If either an empty string or NULL is passed, a default logging output will be
used the same way as it would be in case writing an empty string to the
libvirtd.conf

Signed-off-by: Erik Skultety <eskultet@redhat.com>

diff --git a/daemon/admin.c b/daemon/admin.c
index f3bc1dea4927740935139e309ba0313e6bd9533f..16a34538d14c5b1b0690fc436bb0bd2c9d9a7be0 100644 (file)
--- a/daemon/admin.c
+++ b/daemon/admin.c
@@ -415,6 +415,16 @@ adminConnectGetLoggingFilters(char **filters, unsigned int flags)
     return ret;
 }
 
+static int
+adminConnectSetLoggingOutputs(virNetDaemonPtr dmn ATTRIBUTE_UNUSED,
+                              const char *outputs,
+                              unsigned int flags)
+{
+    virCheckFlags(0, -1);
+
+    return virLogSetOutputs(outputs);
+}
+
 static int
 adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED,
                                       virNetServerClientPtr client ATTRIBUTE_UNUSED,

diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h
index d76ac2013944469c145f26448a20687e592cbb39..aa33fefc31750c9d40a7ebd3bdac078f69679218 100644 (file)
--- a/include/libvirt/libvirt-admin.h
+++ b/include/libvirt/libvirt-admin.h
@@ -412,6 +412,10 @@ int virAdmConnectGetLoggingFilters(virAdmConnectPtr conn,
                                    char **filters,
                                    unsigned int flags);
 
+int virAdmConnectSetLoggingOutputs(virAdmConnectPtr conn,
+                                   const char *outputs,
+                                   unsigned int flags);
+
 # ifdef __cplusplus
 }
 # endif

diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x
index 8316bc4419a61b582d1c6503d47ff45688170111..1d2116d1a6f1c10e4b7e2e3affb1167610d0d360 100644 (file)
--- a/src/admin/admin_protocol.x
+++ b/src/admin/admin_protocol.x
@@ -201,6 +201,11 @@ struct admin_connect_get_logging_filters_ret {
     unsigned int nfilters;
 };
 
+struct admin_connect_set_logging_outputs_args {
+    admin_string outputs;
+    unsigned int flags;
+};
+
 /* Define the program number, protocol version and procedure numbers here. */
 const ADMIN_PROGRAM = 0x06900690;
 const ADMIN_PROTOCOL_VERSION = 1;
@@ -296,5 +301,10 @@ enum admin_procedure {
     /**
      * @generate: none
      */
-    ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS = 15
+    ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS = 15,
+
+    /**
+     * @generate: both
+     */
+    ADMIN_PROC_CONNECT_SET_LOGGING_OUTPUTS = 16
 };

diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs
index c1725570f5637766cff23459075ed8db316b939b..04bbd7add6476ff9c256052504da211d0bda8258 100644 (file)
--- a/src/admin_protocol-structs
+++ b/src/admin_protocol-structs
@@ -141,6 +141,10 @@ struct admin_connect_get_logging_filters_ret {
         admin_string               filters;
         u_int                      nfilters;
 };
+struct admin_connect_set_logging_outputs_args {
+        admin_string               outputs;
+        u_int                      flags;
+};
 enum admin_procedure {
         ADMIN_PROC_CONNECT_OPEN = 1,
         ADMIN_PROC_CONNECT_CLOSE = 2,
@@ -157,4 +161,5 @@ enum admin_procedure {
         ADMIN_PROC_SERVER_SET_CLIENT_LIMITS = 13,
         ADMIN_PROC_CONNECT_GET_LOGGING_OUTPUTS = 14,
         ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS = 15,
+        ADMIN_PROC_CONNECT_SET_LOGGING_OUTPUTS = 16,
 };

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 29754a899d1779f2c4fbf002f1994479beeaaf87..2bc8b2c0674c9cd9fb7099cfe1e160f49379dd79 100644 (file)
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -1165,3 +1165,41 @@ virAdmConnectGetLoggingFilters(virAdmConnectPtr conn,
     virDispatchError(NULL);
     return -1;
 }
+
+/**
+ * virAdmConnectSetLoggingOutputs:
+ * @conn: pointer to an active admin connection
+ * @outputs: pointer to a string containing a list of outputs to be defined
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Redefine the existing (set of) outputs(s) with a new one specified in
+ * @outputs. If multiple outputs are specified, they need to be delimited by
+ * spaces. The format of each output must conform to the format described in
+ * daemon's configuration file (e.g. libvirtd.conf).
+ *
+ * To reset the existing (set of) output(s) to libvirt's defaults, an empty
+ * string ("") or NULL should be passed in @outputs.
+ *
+ * Returns 0 if the new output or the set of outputs has been defined
+ * successfully, or -1 in case of an error.
+ */
+int
+virAdmConnectSetLoggingOutputs(virAdmConnectPtr conn,
+                               const char *outputs,
+                               unsigned int flags)
+{
+    int ret = -1;
+
+    VIR_DEBUG("conn=%p, outputs=%s, flags=%x", conn, outputs, flags);
+
+    virResetLastError();
+    virCheckAdmConnectReturn(conn, -1);
+
+    if ((ret = remoteAdminConnectSetLoggingOutputs(conn, outputs, flags)) < 0)
+        goto error;
+
+    return ret;
+ error:
+    virDispatchError(NULL);
+    return -1;
+}

diff --git a/src/libvirt_admin_private.syms b/src/libvirt_admin_private.syms
index f2e03d1caa8b4e552d58ec6572e6dfd8c1561e53..ad7fd1f3fcff4f265fa5a6b12488838331d7ec54 100644 (file)
--- a/src/libvirt_admin_private.syms
+++ b/src/libvirt_admin_private.syms
@@ -19,6 +19,7 @@ xdr_admin_connect_list_servers_ret;
 xdr_admin_connect_lookup_server_args;
 xdr_admin_connect_lookup_server_ret;
 xdr_admin_connect_open_args;
+xdr_admin_connect_set_logging_outputs_args;
 xdr_admin_server_get_client_limits_args;
 xdr_admin_server_get_client_limits_ret;
 xdr_admin_server_get_threadpool_parameters_args;

diff --git a/src/libvirt_admin_public.syms b/src/libvirt_admin_public.syms
index 8bd3163b65d8771f1a6c593c592852f8348ead93..e6c853803de073dc61053f939a47228dc710d6bc 100644 (file)
--- a/src/libvirt_admin_public.syms
+++ b/src/libvirt_admin_public.syms
@@ -44,4 +44,5 @@ LIBVIRT_ADMIN_3.0.0 {
     global:
         virAdmConnectGetLoggingOutputs;
         virAdmConnectGetLoggingFilters;
+        virAdmConnectSetLoggingOutputs;
 } LIBVIRT_ADMIN_2.0.0;