mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
|
From a588ecc2817db93ec22e5e2a8c9fdcfb59839875 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
||
|
|
Date: Mon, 13 Aug 2018 13:39:09 +0200
|
||
|
|
Subject: [PATCH 05/16] Revert "tests: qemucapsprobe: Fix output after
|
||
|
|
switching to jansson"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
tests/qemucapsprobemock.c | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
|
||
|
|
index 049b16273a..5936975505 100644
|
||
|
|
--- a/tests/qemucapsprobemock.c
|
||
|
|
+++ b/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(qemuMonitorPtr mon,
|
||
|
|
printLineSkipEmpty("\n", stdout);
|
||
|
|
|
||
|
|
printLineSkipEmpty(json, stdout);
|
||
|
|
- printLineSkipEmpty("\n", stdout);
|
||
|
|
}
|
||
|
|
|
||
|
|
cleanup:
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|