'qemuMonitorTestAddItemExpect' doesn't do QMP schema validation. Since
it's the only use we can reimplement it using 'qemuMonitorTestAddItemVerbatim'
which does schema validation and remove the old code instead.
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
tests/qemumonitorjsontest.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 3dabd5c00d..f6b6da372c 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -618,9 +618,18 @@ testQemuMonitorJSONAttachChardev(const void *opaque)
if (data->expectargs) {
g_autofree char *jsonreply = g_strdup_printf("{\"return\": {%s}}",
NULLSTR_EMPTY(data->reply));
+ g_autofree char *jsoncommand = NULL;
+ char *n;
- if (qemuMonitorTestAddItemExpect(test, "chardev-add",
- data->expectargs, true, jsonreply) <
0)
+ jsoncommand = g_strdup_printf("{\"execute\": \"chardev-add\",
\"arguments\": %s, \"id\" : \"libvirt-1\"}", data->expectargs);
+
+ /* data->expectargs has ' instead of " */
+ for (n = jsoncommand; *n; n++) {
+ if (*n == '\'')
+ *n = '"';
+ }
+
+ if (qemuMonitorTestAddItemVerbatim(test, jsoncommand, NULL, jsonreply)
< 0)
return -1;
}
--
2.40.1
