[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 18/23] migration-test: Clean up string interpolat
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 18/23] migration-test: Clean up string interpolation into QMP, part 2 |
Date: |
Mon, 30 Jul 2018 10:33:12 +0200 |
Leaving interpolation into JSON to qmp() is more robust than building
QMP input manually, as explained in the recent commit "tests: Clean up
string interpolation into QMP input (simple cases)".
migrate() interpolates members into a JSON object. Change it to take
its extra QMP arguments as arguments for qdict_from_jsonf_nofail()
instead of a string containing JSON members.
Bonus: gets rid of a non-literal format string. A step towards
compile-time format string checking without triggering
-Wformat-nonliteral.
Cc: Juan Quintela <address@hidden>
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/migration-test.c | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 323bb60535..beccb6337e 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -14,6 +14,7 @@
#include "libqtest.h"
#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qjson.h"
#include "qemu/option.h"
#include "qemu/range.h"
#include "qemu/sockets.h"
@@ -381,16 +382,25 @@ static void migrate_set_capability(QTestState *who, const
char *capability,
qobject_unref(rsp);
}
-static void migrate(QTestState *who, const char *uri, const char *extra)
+/*
+ * Send QMP command "migrate".
+ * Arguments are built from @fmt... (formatted like
+ * qobject_from_jsonf_nofail()) with "uri": @uri spliced in.
+ */
+GCC_FMT_ATTR(3, 4)
+static void migrate(QTestState *who, const char *uri, const char *fmt, ...)
{
- QDict *rsp;
- gchar *cmd;
+ va_list ap;
+ QDict *args, *rsp;
- cmd = g_strdup_printf("{ 'execute': 'migrate',"
- " 'arguments': { 'uri': '%s' %s } }",
- uri, extra ? extra : "");
- rsp = qtest_qmp(who, cmd);
- g_free(cmd);
+ va_start(ap, fmt);
+ args = qdict_from_vjsonf_nofail(fmt, ap);
+ va_end(ap);
+
+ g_assert(!qdict_haskey(args, "uri"));
+ qdict_put_str(args, "uri", uri);
+
+ rsp = qmp("{ 'execute': 'migrate', 'arguments': %p}", args);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
}
@@ -582,7 +592,7 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
- migrate(from, uri, NULL);
+ migrate(from, uri, "{}");
g_free(uri);
wait_for_migration_pass(from);
@@ -665,7 +675,7 @@ static void test_postcopy_recovery(void)
* the newly created channel
*/
wait_for_migration_status(from, "postcopy-paused");
- migrate(from, uri, ", 'resume': true");
+ migrate(from, uri, "{'resume': true}");
g_free(uri);
/* Restore the postcopy bandwidth to unlimited */
@@ -684,7 +694,7 @@ static void test_baddest(void)
if (test_migrate_start(&from, &to, "tcp:0:0", true)) {
return;
}
- migrate(from, "tcp:0:0", NULL);
+ migrate(from, "tcp:0:0", "{}");
do {
status = migrate_query_status(from);
g_assert(!strcmp(status, "setup") || !(strcmp(status, "failed")));
@@ -722,7 +732,7 @@ static void test_precopy_unix(void)
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
- migrate(from, uri, NULL);
+ migrate(from, uri, "{}");
wait_for_migration_pass(from);
--
2.17.1
- [Qemu-devel] [PATCH v3 09/23] qobject: qobject_from_jsonv() is dangerous, hide it away, (continued)
- [Qemu-devel] [PATCH v3 09/23] qobject: qobject_from_jsonv() is dangerous, hide it away, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 01/23] libqtest: Document calling conventions, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 05/23] qobject: Replace qobject_from_jsonf() by qobject_from_jsonf_nofail(), Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 10/23] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 04/23] libqtest: Clean up how we read the QMP greeting, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 12/23] cpu-plug-test: Don't pass integers as strings to device_add, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 16/23] migration-test: Make wait_command() cope with '%', Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 23/23] libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 08/23] test-qobject-input-visitor: Avoid format string ambiguity, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 17/23] migration-test: Clean up string interpolation into QMP, part 1, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 18/23] migration-test: Clean up string interpolation into QMP, part 2,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 14/23] migration-test: Make wait_command() return the "return" member, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 21/23] libqtest: Remove qtest_qmp_discard_response() & friends, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 02/23] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 15/23] tests: New helper qtest_qmp_receive_success(), Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 19/23] migration-test: Clean up string interpolation into QMP, part 3, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 11/23] tests: Clean up string interpolation into QMP input (simple cases), Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 20/23] libqtest: Enable compile-time format string checking, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 22/23] libqtest: Replace qtest_startf() by qtest_initf(), Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 13/23] tests: Clean up string interpolation around qtest_qmp_device_add(), Markus Armbruster, 2018/07/30