[libvirt] [RFC PATCH 5/9] tests: qemucapsprobemock: Fail if JSON reply from qemu can't be reformatted

Peter Krempa pkrempa at redhat.com
Fri Jun 1 08:19:57 UTC 2018


Rather than skipping output on failure fail loudly.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemucapsprobemock.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index f26fa6b285..a0d2acb69a 100644
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -86,9 +86,12 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,

     ret = realQemuMonitorJSONIOProcessLine(mon, line, msg);

-    if (ret == 0 &&
-        (value = virJSONValueFromString(line)) &&
-        (json = virJSONValueToString(value, 1))) {
+    if (ret == 0) {
+        if (!(value = virJSONValueFromString(line)) ||
+            !(json = virJSONValueToString(value, true))) {
+            fprintf(stderr, "Failed to reformat reply string '%s'\n", line);
+            abort();
+        }

         if (first) {
             first = false;
-- 
2.16.2




More information about the libvir-list mailing list