blob: dff29dff96752fc676b3ffcb3a7679f506d1cf0a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From: =?utf-8?q?J=C3=A1n_Tomko?= <jtomko@redhat.com>
Date: Mon, 13 Aug 2018 13:38:46 +0200
Subject: Revert "util: jsoncompat: Stub out virJSONInitialize when compiling
without jansson"
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
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>
---
src/util/virjsoncompat.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/util/virjsoncompat.c b/src/util/virjsoncompat.c
index ffbeb54..6c853e9 100644
--- a/src/util/virjsoncompat.c
+++ b/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 */
|
