forked from pool/libvirt
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
|
commit 9ed59012d3ccdf8365f5e8119959017849bc89fd
|
||
|
|
Author: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Date: Mon Aug 13 13:38:38 2018 +0200
|
||
|
|
|
||
|
|
Revert "remote: daemon: Make sure that JSON symbols are properly loaded at startup"
|
||
|
|
|
||
|
|
This reverts commit 3251fc9c9b9639c3fec3181530599415523d671a.
|
||
|
|
|
||
|
|
Jansson cannot parse QEMU's quirky JSON.
|
||
|
|
Revert back to yajl.
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1614569
|
||
|
|
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
|
||
|
|
Index: libvirt-4.6.0/src/libvirt_private.syms
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-4.6.0.orig/src/libvirt_private.syms
|
||
|
|
+++ libvirt-4.6.0/src/libvirt_private.syms
|
||
|
|
@@ -2135,10 +2135,6 @@ virJSONValueObjectStealObject;
|
||
|
|
virJSONValueToString;
|
||
|
|
|
||
|
|
|
||
|
|
-# util/virjsoncompat.h
|
||
|
|
-virJSONInitialize;
|
||
|
|
-
|
||
|
|
-
|
||
|
|
# util/virkeycode.h
|
||
|
|
virKeycodeSetTypeFromString;
|
||
|
|
virKeycodeSetTypeToString;
|
||
|
|
Index: libvirt-4.6.0/src/remote/remote_daemon.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-4.6.0.orig/src/remote/remote_daemon.c
|
||
|
|
+++ libvirt-4.6.0/src/remote/remote_daemon.c
|
||
|
|
@@ -59,7 +59,6 @@
|
||
|
|
#include "virutil.h"
|
||
|
|
#include "virgettext.h"
|
||
|
|
#include "util/virnetdevopenvswitch.h"
|
||
|
|
-#include "virjsoncompat.h"
|
||
|
|
|
||
|
|
#include "driver.h"
|
||
|
|
|
||
|
|
@@ -1184,9 +1183,6 @@ int main(int argc, char **argv) {
|
||
|
|
exit(EXIT_FAILURE);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (virJSONInitialize() < 0)
|
||
|
|
- exit(EXIT_FAILURE);
|
||
|
|
-
|
||
|
|
daemonSetupNetDevOpenvswitch(config);
|
||
|
|
|
||
|
|
if (daemonSetupAccessManager(config) < 0) {
|