Re: [Qemu-devel] [PATCH 10/20] tests: Pass literal format strings directly to qmp_FOO()

[Philippe Mathieu-Daudé]

On 07/12/2018 08:12 AM, Markus Armbruster wrote:
> 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>

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