提交 92f130a2 编写于 作者: J Ján Tomko

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: NJán Tomko <jtomko@redhat.com>
上级 0c1e0350
......@@ -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.
......
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册