On 08/18/2017 06:15 PM, Eric Blake wrote:
> Don't open-code something that has a convenient helper available.
>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> tests/numa-test.c | 21 +++------------------
> 1 file changed, 3 insertions(+), 18 deletions(-)
>
> diff --git a/tests/numa-test.c b/tests/numa-test.c
> index 3f636840b1..e1b6152244 100644
> --- a/tests/numa-test.c
> +++ b/tests/numa-test.c
> @@ -17,21 +17,6 @@ static char *make_cli(const char *generic_cli, const char *test_cli)
> return g_strdup_printf("%s %s", generic_cli ? generic_cli : "", test_cli);
> }
>
> -static char *hmp_info_numa(void)
> -{
> - QDict *resp;
> - char *s;
> -
> - resp = qmp("{ 'execute': 'human-monitor-command', 'arguments': "
> - "{ 'command-line': 'info numa '} }");
> - g_assert(resp);
> - g_assert(qdict_haskey(resp, "return"));
> - s = g_strdup(qdict_get_str(resp, "return"));
> - g_assert(s);
> - QDECREF(resp);
> - return s;
> -}
> -
> static void test_mon_explicit(const void *data)
> {
> char *s;
> @@ -42,7 +27,7 @@ static void test_mon_explicit(const void *data)
> "-numa node,nodeid=1,cpus=4-7 ");
> qtest_start(cli);
>
> - s = hmp_info_numa();
> + s = hmp("info numa");
> g_assert(strstr(s, "node 0 cpus: 0 1 2 3"));
> g_assert(strstr(s, "node 1 cpus: 4 5 6 7"));
> g_free(s);
> @@ -59,7 +44,7 @@ static void test_mon_default(const void *data)
> cli = make_cli(data, "-smp 8 -numa node -numa node");
> qtest_start(cli);
>
> - s = hmp_info_numa();
> + s = hmp("info numa");
> g_assert(strstr(s, "node 0 cpus: 0 2 4 6"));
> g_assert(strstr(s, "node 1 cpus: 1 3 5 7"));
> g_free(s);
> @@ -78,7 +63,7 @@ static void test_mon_partial(const void *data)
> "-numa node,nodeid=1,cpus=4-5 ");
> qtest_start(cli);
>
> - s = hmp_info_numa();
> + s = hmp("info numa");
> g_assert(strstr(s, "node 0 cpus: 0 1 2 3 6 7"));
> g_assert(strstr(s, "node 1 cpus: 4 5"));
> g_free(s);
>