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
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
commit b56950fd277c0e31cbdf3a0e5b3c944f9857789a
|
|
Author: Ján Tomko <jtomko@redhat.com>
|
|
Date: Mon Aug 13 13:39:09 2018 +0200
|
|
|
|
Revert "tests: qemucapsprobe: Fix output after switching to jansson"
|
|
|
|
This reverts commit 397447f80588438545994a86883792a5999cad15.
|
|
|
|
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/tests/qemucapsprobemock.c
|
|
===================================================================
|
|
--- libvirt-4.6.0.orig/tests/qemucapsprobemock.c
|
|
+++ libvirt-4.6.0/tests/qemucapsprobemock.c
|
|
@@ -76,7 +76,6 @@ qemuMonitorSend(qemuMonitorPtr mon,
|
|
printLineSkipEmpty("\n", stdout);
|
|
|
|
printLineSkipEmpty(reformatted, stdout);
|
|
- printLineSkipEmpty("\n", stdout);
|
|
VIR_FREE(reformatted);
|
|
|
|
return realQemuMonitorSend(mon, msg);
|
|
@@ -117,7 +116,6 @@ qemuMonitorJSONIOProcessLine(qemuMonitor
|
|
printLineSkipEmpty("\n", stdout);
|
|
|
|
printLineSkipEmpty(json, stdout);
|
|
- printLineSkipEmpty("\n", stdout);
|
|
}
|
|
|
|
cleanup:
|