diff options
Diffstat (limited to 'debian/patches/Revert-remote-daemon-Make-sure-that-JSON-symbols-are-prop.patch')
-rw-r--r-- | debian/patches/Revert-remote-daemon-Make-sure-that-JSON-symbols-are-prop.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/debian/patches/Revert-remote-daemon-Make-sure-that-JSON-symbols-are-prop.patch b/debian/patches/Revert-remote-daemon-Make-sure-that-JSON-symbols-are-prop.patch deleted file mode 100644 index 80689bf96..000000000 --- a/debian/patches/Revert-remote-daemon-Make-sure-that-JSON-symbols-are-prop.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: =?utf-8?q?J=C3=A1n_Tomko?= <jtomko@redhat.com> -Date: Mon, 13 Aug 2018 13:38:38 +0200 -Subject: Revert "remote: daemon: Make sure that JSON symbols are properly - loaded at startup" -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -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> ---- - src/libvirt_private.syms | 4 ---- - src/remote/remote_daemon.c | 4 ---- - 2 files changed, 8 deletions(-) - -diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms -index 70dfcc5..fc386e1 100644 ---- a/src/libvirt_private.syms -+++ b/src/libvirt_private.syms -@@ -2135,10 +2135,6 @@ 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 8bbc381..9f3a5f3 100644 ---- a/src/remote/remote_daemon.c -+++ b/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) { |