From d9d6b61f6dc494c71b47ab0d450448c53e0b7952 Mon Sep 17 00:00:00 2001
From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 17 Mar 2016 15:18:06 +0100
Subject: [PATCH] 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>
---
 src/libvirt_private.syms |  1 +
 src/util/virlog.c        | 25 +++++++++++++++++++++++++
 src/util/virlog.h        |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ae22a51723..5914769acf 100644
--- 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 df8b5bc22a..5543a11350 100644
--- 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 4e557f8d38..3c4cd556e2 100644
--- 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