Re: [Qemu-devel] [PATCH v2 18/23] migration-test: Clean up string interpolation into QMP, part 2

[Eric Blake]

On 07/27/2018 10:13 AM, Markus Armbruster wrote:
> 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>
> ---
>   tests/migration-test.c | 28 ++++++++++++++++------------
>   1 file changed, 16 insertions(+), 12 deletions(-)

> +++ 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,19 @@ static void migrate_set_capability(QTestState *who, const 
> char *capability,
>       qobject_unref(rsp);
>   }
>   
> -static void migrate(QTestState *who, const char *uri, const char *extra)
> +static void migrate(QTestState *who, const char *uri, const char *fmt, ...)
>   {

No gcc attribute?

Reviewed-by: Eric Blake <address@hidden>

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org