From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 14 Jun 2019 18:10:15 +0000 (+0200)
Subject: tests: assume JSON monitor in qemuMonitorTestNewSimple
X-Git-Tag: v5.5.0-rc1~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92f130a2e1684fbce6a721be7f87f21678d6b827;p=thirdparty%2Flibvirt.git

tests: assume JSON monitor in qemuMonitorTestNewSimple

The only user of the qemuMonitorTestNewSimple macro is using JSON.
Always pass 'true' to qemuMonitorTestNew and remove the 'json'
argument.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 8d7c503c6e..03261d649e 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1318,7 +1318,7 @@ qemuMonitorTestNewFromFile(const char *fileName,
     if (virTestLoadFile(fileName, &json) < 0)
         goto cleanup;
 
-    if (simple && !(test = qemuMonitorTestNewSimple(true, xmlopt)))
+    if (simple && !(test = qemuMonitorTestNewSimple(xmlopt)))
         goto cleanup;
 
     /* Our JSON parser expects replies to be separated by a newline character.
diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index a2d2d30820..23192c1223 100644
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -74,8 +74,8 @@ int qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test,
                                  bool apostrophe,
                                  const char *response);
 
-# define qemuMonitorTestNewSimple(json, xmlopt) \
-    qemuMonitorTestNew(json, xmlopt, NULL, NULL, NULL, NULL)
+# define qemuMonitorTestNewSimple(xmlopt) \
+    qemuMonitorTestNew(true, xmlopt, NULL, NULL, NULL, NULL)
 # define qemuMonitorTestNewSchema(xmlopt, schema) \
     qemuMonitorTestNew(true, xmlopt, NULL, NULL, NULL, schema)