[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 03/38] numa-test: Use hmp()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 03/38] numa-test: Use hmp() |
Date: |
Mon, 11 Sep 2017 12:19:47 -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>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <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 v7 00/38] Preliminary libqtest cleanups, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 02/38] qtest: Don't perform side effects inside assertion, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 03/38] numa-test: Use hmp(),
Eric Blake <=
- [Qemu-devel] [PATCH v7 05/38] libqtest: Remove dead qtest_instances variable, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 01/38] test-qga: Kill broken and dead QGA_TEST_SIDE_EFFECTING code, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 04/38] tests: Clean up wait for event, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 06/38] libqtest: Use qemu_strtoul(), Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 07/38] libqtest: Inline qtest_query_target_endianness(), Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 08/38] libqos: Track QTestState with QPCIBus, Eric Blake, 2017/09/11
- [Qemu-devel] [PATCH v7 09/38] libqos: Track QTestState with QVirtioBus, Eric Blake, 2017/09/11