9:30 a.m.
Enable libvirt users to query logging output settings.
---
daemon/admin.c | 42 ++++++++++++++++++++++++++++++++++++++++
include/libvirt/libvirt-admin.h | 4 ++++
src/admin/admin_protocol.x | 16 ++++++++++++++-
src/admin/admin_remote.c | 43 +++++++++++++++++++++++++++++++++++++++++
src/admin_protocol-structs | 8 ++++++++
src/libvirt-admin.c | 39 +++++++++++++++++++++++++++++++++++++
src/libvirt_admin_private.syms | 2 ++
src/libvirt_admin_public.syms | 1 +
8 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/daemon/admin.c b/daemon/admin.c
index ac81b82..5f7a957 100644
--- a/daemon/admin.c
+++ b/daemon/admin.c
@@ -323,6 +323,23 @@ adminConnectGetLoggingFilters(char **filters, unsigned int flags)
}
static int
+adminConnectGetLoggingOutputs(char **outputs, unsigned int flags)
+{
+ char *tmp = NULL;
+ int ret = -1;
+
+ virCheckFlags(0, -1);
+
+ if (!(tmp = virLogGetOutputs()))
+ return -1;
+
+ ret = virLogGetNbOutputs();
+
+ *outputs = tmp;
+ return ret;
+}
+
+static int
adminDispatchConnectGetLoggingFilters(virNetServerPtr server ATTRIBUTE_UNUSED,
virNetServerClientPtr client ATTRIBUTE_UNUSED,
virNetMessagePtr msg ATTRIBUTE_UNUSED,
@@ -349,4 +366,29 @@ adminDispatchConnectGetLoggingFilters(virNetServerPtr server
ATTRIBUTE_UNUSED,
VIR_FREE(filters);
return rv;
}
+
+static int
+adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED,
+ virNetServerClientPtr client ATTRIBUTE_UNUSED,
+ virNetMessagePtr msg ATTRIBUTE_UNUSED,
+ virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+ admin_connect_get_logging_outputs_args *args,
+ admin_connect_get_logging_outputs_ret *ret)
+{
+ char *outputs = NULL;
+ int noutputs = 0;
+ int rv = -1;
+
+ if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags) < 0))
+ goto cleanup;
+
+ ret->outputs = outputs;
+ ret->noutputs = noutputs;
+ rv = 0;
+
+ cleanup:
+ if (rv < 0)
+ virNetMessageSaveError(rerr);
+ return rv;
+}
#include "admin_dispatch.h"
diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h
index 87616d0..755e6a6 100644
--- a/include/libvirt/libvirt-admin.h
+++ b/include/libvirt/libvirt-admin.h
@@ -355,6 +355,10 @@ int virAdmConnectGetLoggingFilters(virAdmConnectPtr conn,
char **filters,
unsigned int flags);
+int virAdmConnectGetLoggingOutputs(virAdmConnectPtr conn,
+ char **outputs,
+ unsigned int flags);
+
# ifdef __cplusplus
}
# endif
diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x
index 05eecec..5465efe 100644
--- a/src/admin/admin_protocol.x
+++ b/src/admin/admin_protocol.x
@@ -178,6 +178,15 @@ struct admin_connect_get_logging_filters_ret {
unsigned int nfilters;
};
+struct admin_connect_get_logging_outputs_args {
+ unsigned int flags;
+};
+
+struct admin_connect_get_logging_outputs_ret {
+ admin_nonnull_string outputs;
+ unsigned int noutputs;
+};
+
/* Define the program number, protocol version and procedure numbers here. */
const ADMIN_PROGRAM = 0x06900690;
const ADMIN_PROTOCOL_VERSION = 1;
@@ -258,5 +267,10 @@ enum admin_procedure {
/**
* @generate: none
*/
- ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS = 12
+ ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS = 12,
+
+ /**
+ * @generate: none
+ */
+ ADMIN_PROC_CONNECT_GET_LOGGING_OUTPUTS = 13
};
diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
index 86deaec..0d00797 100644
--- a/src/admin/admin_remote.c
+++ b/src/admin/admin_remote.c
@@ -398,3 +398,46 @@ remoteAdminConnectGetLoggingFilters(virAdmConnectPtr conn,
virObjectUnlock(priv);
return rv;
}
+
+static int
+remoteAdminConnectGetLoggingOutputs(virAdmConnectPtr conn,
+ char **outputs,
+ unsigned int flags)
+{
+ int rv = -1;
+ char *tmp_outputs = NULL;
+ remoteAdminPrivPtr priv = conn->privateData;
+ admin_connect_get_logging_outputs_args args;
+ admin_connect_get_logging_outputs_ret ret;
+
+ args.flags = flags;
+
+ memset(&ret, 0, sizeof(ret));
+ virObjectLock(priv);
+
+ if (call(conn,
+ 0,
+ ADMIN_PROC_CONNECT_GET_LOGGING_OUTPUTS,
+ (xdrproc_t) xdr_admin_connect_get_logging_outputs_args,
+ (char *) &args,
+ (xdrproc_t) xdr_admin_connect_get_logging_outputs_ret,
+ (char *) &ret) == -1)
+ goto done;
+
+ if (outputs) {
+ if (VIR_STRDUP(tmp_outputs, ret.outputs) < 0)
+ goto cleanup;
+
+ *outputs = tmp_outputs;
+ tmp_outputs = NULL;
+ }
+
+ rv = ret.noutputs;
+
+ cleanup:
+ xdr_free((xdrproc_t) xdr_admin_connect_get_logging_outputs_ret, (char *) &ret);
+
+ done:
+ virObjectUnlock(priv);
+ return rv;
+}
diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs
index bbe4a5a..7cf2421 100644
--- a/src/admin_protocol-structs
+++ b/src/admin_protocol-structs
@@ -119,6 +119,13 @@ struct admin_connect_get_logging_filters_ret {
admin_nonnull_string filters;
u_int nfilters;
};
+struct admin_connect_get_logging_outputs_args {
+ u_int flags;
+};
+struct admin_connect_get_logging_outputs_ret {
+ admin_nonnull_string outputs;
+ u_int noutputs;
+};
enum admin_procedure {
ADMIN_PROC_CONNECT_OPEN = 1,
ADMIN_PROC_CONNECT_CLOSE = 2,
@@ -132,4 +139,5 @@ enum admin_procedure {
ADMIN_PROC_CLIENT_GET_INFO = 10,
ADMIN_PROC_CONNECT_GET_LOGGING_LEVEL = 11,
ADMIN_PROC_CONNECT_GET_LOGGING_FILTERS = 12,
+ ADMIN_PROC_CONNECT_GET_LOGGING_OUTPUTS = 13,
};
diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index e61dc10..95b47c0 100644
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -1049,3 +1049,42 @@ virAdmConnectGetLoggingFilters(virAdmConnectPtr conn,
virDispatchError(NULL);
return -1;
}
+
+/**
+ * virAdmConnectGetLoggingOutputs:
+ * @conn: pointer to an active admin connection
+ * @outputs: pointer to a variable to store a string containing all currently
+ * defined logging outputs on daemon (allocated automatically)
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Retrieves a list of currently installed logging outputs. Outputs returned
+ * are contained within an automatically allocated string and delimited by
+ * spaces. The format of each output conforms to the format described in
+ * daemon's configuration file (e.g. libvirtd.conf).
+ * To retrieve individual outputs, additional parsing needs to be done by the
+ * caller. Caller is also responsible for freeing @outputs correctly.
+ *
+ * Returns the count of outputs in @outputs, or -1 in case of an error.
+ */
+int
+virAdmConnectGetLoggingOutputs(virAdmConnectPtr conn,
+ char **outputs,
+ unsigned int flags)
+{
+ int ret = -1;
+
+ VIR_DEBUG("conn=%p, flags=%x", conn, flags);
+
+ virResetLastError();
+ virCheckAdmConnectReturn(conn, -1);
+ virCheckNonNullArgGoto(outputs, error);
+
+ if ((ret = remoteAdminConnectGetLoggingOutputs(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 6029575..ac183c6 100644
--- a/src/libvirt_admin_private.syms
+++ b/src/libvirt_admin_private.syms
@@ -13,6 +13,8 @@ xdr_admin_connect_get_logging_filters_args;
xdr_admin_connect_get_logging_filters_ret;
xdr_admin_connect_get_logging_level_args;
xdr_admin_connect_get_logging_level_ret;
+xdr_admin_connect_get_logging_outputs_args;
+xdr_admin_connect_get_logging_outputs_ret;
xdr_admin_connect_list_servers_args;
xdr_admin_connect_list_servers_ret;
xdr_admin_connect_lookup_server_args;
diff --git a/src/libvirt_admin_public.syms b/src/libvirt_admin_public.syms
index d7648a3..68475b1 100644
--- a/src/libvirt_admin_public.syms
+++ b/src/libvirt_admin_public.syms
@@ -28,6 +28,7 @@ LIBVIRT_ADMIN_1.3.0 {
virAdmConnectListServers;
virAdmConnectGetLoggingLevel;
virAdmConnectGetLoggingFilters;
+ virAdmConnectGetLoggingOutputs;
virAdmServerGetName;
virAdmServerGetThreadPoolParameters;
virAdmServerFree;
--
2.4.11