[PATCH 4/8] util: Initialize virLogMutex statically

Martin Kletzander mkletzan at redhat.com
Tue Jan 4 13:47:08 UTC 2022

The only difference is that we are not going to be guaranteed that the mutex is
normal (as opposed to recursive, although there is no system known to me that
would default to recursive mutexes), but that was done only to find occasional
errors (during runtime, back in 2010, commit 336fd879c00b).  Functions using
this mutex are mostly stable and unchanging, and it makes the virLogOnceInit()
function only return 0 (or possibly abort in glib calls).  On top of that we can
assume that the virLogMutex is always initialized which enables us to be more
consistent in some early error reporting.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
 src/util/virlog.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/util/virlog.c b/src/util/virlog.c
index e368cada6024..5848940c6ccb 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -125,7 +125,7 @@ static void virLogOutputToFd(virLogSource *src,
  * Logs accesses must be serialized though a mutex
-virMutex virLogMutex;
+static virMutex virLogMutex = VIR_MUTEX_INITIALIZER;
@@ -250,9 +250,6 @@ virLogPriorityString(virLogPriority lvl)
 static int
-    if (virMutexInit(&virLogMutex) < 0)
-        return -1;
     virLogDefaultPriority = VIR_LOG_DEFAULT;

More information about the libvir-list mailing list