forked from pool/libvirt
38 lines
962 B
Diff
38 lines
962 B
Diff
|
commit 54f2b5e330aa20c9745b2545fc88973539015b98
|
||
|
|
Author: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Date: Mon Aug 13 13:38:46 2018 +0200
|
||
|
|
|
||
|
|
Revert "util: jsoncompat: Stub out virJSONInitialize when compiling without jansson"
|
||
|
|
|
||
|
|
This reverts commit 9e44c2db8ad94d3c20acc1d081538c280af198b4.
|
||
|
|
|
||
|
|
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/util/virjsoncompat.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-4.6.0.orig/src/util/virjsoncompat.c
|
||
|
|
+++ libvirt-4.6.0/src/util/virjsoncompat.c
|
||
|
|
@@ -271,15 +271,4 @@ json_true_impl(void)
|
||
|
|
return json_true_ptr();
|
||
|
|
}
|
||
|
|
|
||
|
|
-
|
||
|
|
-#else /* !WITH_JANSSON */
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-virJSONInitialize(void)
|
||
|
|
-{
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-#endif /* !WITH_JANSSON */
|
||
|
|
+#endif /* WITH_JANSSON */
|