[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/23] tests: Pass literal format strings directl
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 10/23] tests: Pass literal format strings directly to qmp_FOO() |
Date: |
Mon, 30 Jul 2018 10:33:04 +0200 |
The qmp_FOO() take a printf-like format string. In a few places, we
assign a string literal to a variable and pass that instead of simply
passing the literal. Clean that up.
Bonus: gets rid of non-literal format strings. A step towards
compile-time format string checking without triggering
-Wformat-nonliteral.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/ahci-test.c | 4 +---
tests/ide-test.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 7e3491b5bd..19a7ab1bca 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -1352,7 +1352,6 @@ static void test_flush_migrate(void)
AHCIQState *src, *dst;
AHCICommand *cmd;
uint8_t px;
- const char *s;
char *uri = g_strdup_printf("unix:%s", mig_socket);
prepare_blkdebug_script(debug_path, "flush_to_disk");
@@ -1388,8 +1387,7 @@ static void test_flush_migrate(void)
ahci_migrate(src, dst, uri);
/* Complete the command */
- s = "{'execute':'cont' }";
- qmp_send(s);
+ qmp_send("{'execute':'cont' }");
qmp_eventwait("RESUME");
ahci_command_wait(dst, cmd);
ahci_command_verify(dst, cmd);
diff --git a/tests/ide-test.c b/tests/ide-test.c
index 2384c2c3e2..834ee9005b 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -694,7 +694,6 @@ static void test_retry_flush(const char *machine)
QPCIDevice *dev;
QPCIBar bmdma_bar, ide_bar;
uint8_t data;
- const char *s;
prepare_blkdebug_script(debug_path, "flush_to_disk");
@@ -722,8 +721,7 @@ static void test_retry_flush(const char *machine)
qmp_eventwait("STOP");
/* Complete the command */
- s = "{'execute':'cont' }";
- qmp_discard_response(s);
+ qmp_discard_response("{'execute':'cont' }");
/* Check registers */
data = qpci_io_readb(dev, ide_bar, reg_device);
--
2.17.1
- [Qemu-devel] [PATCH v3 00/23] tests: Compile-time format string checking for libqtest.h, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 06/23] qobject: New qobject_from_vjsonf_nofail(), qdict_from_vjsonf_nofail(), Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 07/23] libqtest: Simplify qmp_fd_vsend() a bit, Markus Armbruster, 2018/07/30
- [Qemu-devel] [PATCH v3 03/23] libqtest: Clean up how we read device_del messages, Markus Armbruster, 2018/07/30
- [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 <=
- [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, 2018/07/30
- [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