[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 13/13] numa-test: Use hmp()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v5 13/13] numa-test: Use hmp() |
Date: |
Fri, 18 Aug 2017 16:15:42 -0500 |
Don't open-code something that has a convenient helper available.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
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);
--
2.13.5
- [Qemu-devel] [PATCH v5 06/13] libqtest: Topologically sort functions, (continued)
- [Qemu-devel] [PATCH v5 06/13] libqtest: Topologically sort functions, Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 04/13] libqtest: Let socket_send() compute length, Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 05/13] libqtest: Use qemu_strtoul(), Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 07/13] libqtest: Inline qtest_query_target_endianness(), Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 10/13] libqtest: Drop qtest_init() and qtest_qmp_discard_response(), Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 09/13] libqtest: Shorten a couple more qtest_* functions, Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 12/13] libqtest: Use global_qtest in qtest_sendf() and qtest_rsp(), Eric Blake, 2017/08/18
- [Qemu-devel] [PATCH v5 13/13] numa-test: Use hmp(),
Eric Blake <=
- [Qemu-devel] [PATCH v5 08/13] tests: Rely more on global_qtest, Eric Blake, 2017/08/18
- Re: [Qemu-devel] [PATCH v5 08/13] tests: Rely more on global_qtest, John Snow, 2017/08/18
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Paolo Bonzini, 2017/08/19
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Eric Blake, 2017/08/23
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Paolo Bonzini, 2017/08/23
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Eric Blake, 2017/08/23
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Paolo Bonzini, 2017/08/23
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Markus Armbruster, 2017/08/24
- Re: [Qemu-devel] [Qemu-block] [PATCH v5 08/13] tests: Rely more on global_qtest, Paolo Bonzini, 2017/08/24