From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 1 Aug 2018 10:51:10 +0000 (+0200)
Subject: remote: daemon: Make sure that JSON symbols are properly loaded at startup
X-Git-Tag: v4.6.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3251fc9c9b9639c3fec3181530599415523d671a;p=thirdparty%2Flibvirt.git

remote: daemon: Make sure that JSON symbols are properly loaded at startup

Explicitly call virJSONInitialize at startup of the libvirt daemon so
that we are sure that the symbols in the compat library are properly
loaded. This will prevent any random failure from happening later on
when the daemon would want to use the JSON parser.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index fc386e1699..70dfcc5e29 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2135,6 +2135,10 @@ virJSONValueObjectStealObject;
 virJSONValueToString;
 
 
+# util/virjsoncompat.h
+virJSONInitialize;
+
+
 # util/virkeycode.h
 virKeycodeSetTypeFromString;
 virKeycodeSetTypeToString;
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 9f3a5f38ad..8bbc3818bb 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -59,6 +59,7 @@
 #include "virutil.h"
 #include "virgettext.h"
 #include "util/virnetdevopenvswitch.h"
+#include "virjsoncompat.h"
 
 #include "driver.h"
 
@@ -1183,6 +1184,9 @@ int main(int argc, char **argv) {
         exit(EXIT_FAILURE);
     }
 
+    if (virJSONInitialize() < 0)
+        exit(EXIT_FAILURE);
+
     daemonSetupNetDevOpenvswitch(config);
 
     if (daemonSetupAccessManager(config) < 0) {