[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 1 |
Date: |
Mon, 6 Aug 2018 08:53:39 +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_recover() builds QMP input manually because wait_command()
can't interpolate. Well, it can since the previous commit. Simplify
accordingly.
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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 7bffcd2e4d..4b8d4cc119 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -159,6 +159,7 @@ static void stop_cb(void *opaque, const char *name, QDict
*data)
/*
* Events can get in the way of responses we are actually waiting for.
*/
+GCC_FMT_ATTR(2, 3)
static QDict *wait_command(QTestState *who, const char *command, ...)
{
va_list ap;
@@ -357,13 +358,12 @@ static void migrate_pause(QTestState *who)
static void migrate_recover(QTestState *who, const char *uri)
{
QDict *rsp;
- gchar *cmd = g_strdup_printf(
- "{ 'execute': 'migrate-recover', "
- " 'id': 'recover-cmd', "
- " 'arguments': { 'uri': '%s' } }", uri);
- rsp = wait_command(who, cmd);
- g_free(cmd);
+ rsp = wait_command(who,
+ "{ 'execute': 'migrate-recover', "
+ " 'id': 'recover-cmd', "
+ " 'arguments': { 'uri': %s } }",
+ uri);
qobject_unref(rsp);
}
--
2.17.1
- [Qemu-devel] [PATCH v3 23/23] libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency, (continued)
- [Qemu-devel] [PATCH v3 23/23] libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 15/23] migration-test: Make wait_command() return the "return" member, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 22/23] libqtest: Replace qtest_startf() by qtest_initf(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 20/23] migration-test: Clean up string interpolation into QMP, part 3, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 11/23] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 06/23] qobject: Replace qobject_from_jsonf() by qobject_from_jsonf_nofail(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 02/23] libqtest: Clean up how we read device_del messages, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 10/23] qobject: qobject_from_jsonv() is dangerous, hide it away, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 01/23] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 18/23] migration-test: Clean up string interpolation into QMP, part 1,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 21/23] libqtest: Enable compile-time format string checking, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 19/23] migration-test: Clean up string interpolation into QMP, part 2, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 16/23] tests: New helper qtest_qmp_receive_success(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 14/23] tests: Clean up string interpolation around qtest_qmp_device_add(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 12/23] tests: Clean up string interpolation into QMP input (simple cases), Markus Armbruster, 2018/08/06