forked from pool/libvirt
4daedcf6c9
- Revert switch to jansson
boo#1104820
- Dropped:
temp-build-fix.patch
- Added:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch
- spec: don't restart libvirt-guests when updating libvirt-client
bsc#1104662
OBS-URL: https://build.opensuse.org/request/show/629264
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=701
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) {
|