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:
|