Commit 62fff696 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

tests: Pass literal format strings directly to qmp_FOO() 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20180806065344.7103-12-armbru@redhat.com>
parent 2d36e843

tests/ahci-test.c

+1 −3
Original line number Diff line number Diff line
@@ -1355,7 +1355,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");
@@ -1391,8 +1390,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);

tests/ide-test.c

+1 −3
Original line number Diff line number Diff line
@@ -697,7 +697,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");
@@ -725,8 +724,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);