From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 May 2023 11:43:53 +0000 (+0200)
Subject: qemuMonitorJSONTestAttachOneChardev: Rewrite using qemuMonitorTestAddItemVerbatim
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e79ccbae1c2006dca20043334d13abb58bae9edb;p=libvirt.git

qemuMonitorJSONTestAttachOneChardev: Rewrite using qemuMonitorTestAddItemVerbatim

'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 <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

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;
     }