提交 9ed59012 编写于 作者: J Ján Tomko

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

This reverts commit 3251fc9c.

Jansson cannot parse QEMU's quirky JSON.
Revert back to yajl.

https://bugzilla.redhat.com/show_bug.cgi?id=1614569Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 44ef7d9e
...@@ -2133,10 +2133,6 @@ virJSONValueObjectStealObject; ...@@ -2133,10 +2133,6 @@ virJSONValueObjectStealObject;
virJSONValueToString; virJSONValueToString;
# util/virjsoncompat.h
virJSONInitialize;
# util/virkeycode.h # util/virkeycode.h
virKeycodeSetTypeFromString; virKeycodeSetTypeFromString;
virKeycodeSetTypeToString; virKeycodeSetTypeToString;
......
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
#include "virutil.h" #include "virutil.h"
#include "virgettext.h" #include "virgettext.h"
#include "util/virnetdevopenvswitch.h" #include "util/virnetdevopenvswitch.h"
#include "virjsoncompat.h"
#include "driver.h" #include "driver.h"
...@@ -1184,9 +1183,6 @@ int main(int argc, char **argv) { ...@@ -1184,9 +1183,6 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (virJSONInitialize() < 0)
exit(EXIT_FAILURE);
daemonSetupNetDevOpenvswitch(config); daemonSetupNetDevOpenvswitch(config);
if (daemonSetupAccessManager(config) < 0) { if (daemonSetupAccessManager(config) < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册