[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 07/13] libqtest: Inline qtest_query_target_endian
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v5 07/13] libqtest: Inline qtest_query_target_endianness() |
Date: |
Fri, 18 Aug 2017 16:15:36 -0500 |
There was only one caller; it's easier to inline things.
Signed-off-by: Eric Blake <address@hidden>
---
tests/libqtest.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 5d16351e24..b6dd26e54a 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -244,20 +244,6 @@ redo:
return words;
}
-static int qtest_query_target_endianness(QTestState *s)
-{
- gchar **args;
- int big_endian;
-
- qtest_sendf(s, "endianness\n");
- args = qtest_rsp(s, 1);
- g_assert(strcmp(args[1], "big") == 0 || strcmp(args[1], "little") == 0);
- big_endian = strcmp(args[1], "big") == 0;
- g_strfreev(args);
-
- return big_endian;
-}
-
static void cleanup_sigabrt_handler(void)
{
sigaction(SIGABRT, &sigact_old, NULL);
@@ -288,6 +274,7 @@ QTestState *qtest_init_without_qmp_handshake(const char
*extra_args)
gchar *qmp_socket_path;
gchar *command;
const char *qemu_binary;
+ gchar **args;
qemu_binary = getenv("QTEST_QEMU_BINARY");
if (!qemu_binary) {
@@ -351,8 +338,11 @@ QTestState *qtest_init_without_qmp_handshake(const char
*extra_args)
}
/* ask endianness of the target */
-
- s->big_endian = qtest_query_target_endianness(s);
+ qtest_sendf(s, "endianness\n");
+ args = qtest_rsp(s, 1);
+ g_assert(strcmp(args[1], "big") == 0 || strcmp(args[1], "little") == 0);
+ s->big_endian = strcmp(args[1], "big") == 0;
+ g_strfreev(args);
return s;
}
--
2.13.5
- Re: [Qemu-devel] [PATCH v5 02/13] qtest: Don't perform side effects inside assertion, (continued)
[Qemu-devel] [PATCH v5 03/13] libqtest: Remove dead qtest_instances variable, Eric Blake, 2017/08/18
[Qemu-devel] [PATCH v5 01/13] test-qga: Kill broken and dead QGA_TEST_SIDE_EFFECTING code, Eric Blake, 2017/08/18
[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 <=
[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, 2017/08/18
[Qemu-devel] [PATCH v5 08/13] tests: Rely more on global_qtest, Eric Blake, 2017/08/18