virlog: Introduce virLogDefineOutputs

Prepare a method that only defines a set of outputs. It takes a list of
outputs, preferably created by virLogParseOutputs. The original set of outputs
is reset and replaced by the new user-provided set of outputs.

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

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ae22a51723d5c49a02a020dfbb174979ab011972..5914769acfc7a35b587c8fa357e291b9eba9bfc8 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1871,6 +1871,7 @@ virLockSpaceReleaseResourcesForOwner;
 # util/virlog.h
 virLogDefineFilter;
 virLogDefineOutput;
+virLogDefineOutputs;
 virLogFilterFree;
 virLogFilterListFree;
 virLogFilterNew;

diff --git a/src/util/virlog.c b/src/util/virlog.c
index df8b5bc22ae5ee6b8b7d8730979c2b590892224c..5543a11350608e45606ba598021e682637615871 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1681,3 +1681,28 @@ virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs,
 
     return -1;
 }
+
+
+/**
+ * virLogDefineOutputs:
+ * @outputs: new set of outputs to be defined
+ * @noutputs: number of outputs in @outputs
+ *
+ * Resets any existing set of outputs and defines a completely new one.
+ *
+ * Returns number of outputs successfully defined or -1 in case of error;
+ */
+int
+virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs)
+{
+    if (virLogInitialize() < 0)
+        return -1;
+
+    virLogLock();
+    virLogResetOutputs();
+    virLogOutputs = outputs;
+    virLogNbOutputs = noutputs;
+    virLogUnlock();
+
+    return 0;
+}

diff --git a/src/util/virlog.h b/src/util/virlog.h
index 4e557f8d3842081e934b7ab0d4084d5b7259db65..3c4cd556e240e6c487de3806bb63a8443d72a766 100644 (file)
--- a/src/util/virlog.h
+++ b/src/util/virlog.h
@@ -237,5 +237,7 @@ virLogFilterPtr virLogFilterNew(const char *match,
                                 unsigned int flags) ATTRIBUTE_NONNULL(1);
 int virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs,
                      virLogDestination dest, const void *opaque);
+int virLogDefineOutputs(virLogOutputPtr *outputs,
+                        size_t noutputs) ATTRIBUTE_NONNULL(1);
 
 #endif