NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-08-09 12:38:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: assume JSON monitor in qemuMonitorTestNewSimple

Browse Source 
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>
This commit is contained in:
Ján Tomko
2019-06-17 16:12:57 +02:00
parent 0c1e035085
commit 92f130a2e1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qemumonitortestutils.c
+1 -1
View File
@@ -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.
tests/qemumonitortestutils.h
+2 -2
View File
@@ -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)