[{"id":1766704,"web_url":"http://patchwork.ozlabs.org/comment/1766704/","msgid":"","list_archive_url":null,"date":"2017-09-12T06:32:42","subject":"Re: [Qemu-devel] [PATCH v7 07/38] libqtest: Inline\n\tqtest_query_target_endianness()","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/","name":"Thomas Huth","email":"thuth@redhat.com"},"content":"On 11.09.2017 19:19, Eric Blake wrote:\n> There was only one caller; it's easier to inline things. (It\n> trades one forward declaration for two others, but it's not\n> worth the additional churn of topological sorting, even though\n> that would be possible.)\n> \n> Signed-off-by: Eric Blake \n> \n> ---\n> v7: Drop the topological sorting\n> ---\n> tests/libqtest.c | 26 +++++++++-----------------\n> 1 file changed, 9 insertions(+), 17 deletions(-)\n> \n> diff --git a/tests/libqtest.c b/tests/libqtest.c\n> index 95d4159b38..1710d63276 100644\n> --- a/tests/libqtest.c\n> +++ b/tests/libqtest.c\n> @@ -49,7 +49,9 @@ static struct sigaction sigact_old;\n> g_assert_cmpint(ret, !=, -1); \\\n> } while (0)\n> \n> -static int qtest_query_target_endianness(QTestState *s);\n> +static void qtest_sendf(QTestState *s, const char *fmt, ...)\n> + GCC_FMT_ATTR(2, 3);\n> +static gchar **qtest_rsp(QTestState *s, int expected_args);\n> \n> static int init_socket(const char *socket_path)\n> {\n> @@ -158,6 +160,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)\n> gchar *qmp_socket_path;\n> gchar *command;\n> const char *qemu_binary;\n> + gchar **args;\n> \n> qemu_binary = getenv(\"QTEST_QEMU_BINARY\");\n> if (!qemu_binary) {\n> @@ -221,8 +224,11 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)\n> }\n> \n> /* ask endianness of the target */\n> -\n> - s->big_endian = qtest_query_target_endianness(s);\n> + qtest_sendf(s, \"endianness\\n\");\n> + args = qtest_rsp(s, 1);\n> + g_assert(strcmp(args[1], \"big\") == 0 || strcmp(args[1], \"little\") == 0);\n> + s->big_endian = strcmp(args[1], \"big\") == 0;\n> + g_strfreev(args);\n> \n> return s;\n> }\n> @@ -367,20 +373,6 @@ redo:\n> return words;\n> }\n> \n> -static int qtest_query_target_endianness(QTestState *s)\n> -{\n> - gchar **args;\n> - int big_endian;\n> -\n> - qtest_sendf(s, \"endianness\\n\");\n> - args = qtest_rsp(s, 1);\n> - g_assert(strcmp(args[1], \"big\") == 0 || strcmp(args[1], \"little\") == 0);\n> - big_endian = strcmp(args[1], \"big\") == 0;\n> - g_strfreev(args);\n> -\n> - return big_endian;\n> -}\n> -\n> typedef struct {\n> JSONMessageParser parser;\n> QDict *response;\n\nLooking at this patch again, I'm not sure anymore whether this is really\nworth the effort. Keeping code that belongs together in a separate\nfunction also makes sense ... Not sure, but I'd maybe rather drop this\npatch. But in case you want to keep it:\n\nReviewed-by: Thomas Huth ","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=thuth@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrw3L0193z9s7g\n\tfor ;\n\tTue, 12 Sep 2017 16:33:15 +1000 (AEST)","from localhost ([::1]:33876 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dreky-0001Ul-MF\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 02:33:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58322)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drekc-0001US-Bu\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 02:32:51 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drekY-0006kf-CP\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 02:32:50 -0400","from mx1.redhat.com ([209.132.183.28]:53646)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1drekY-0006kS-3c\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 02:32:46 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id DD00DC04B928\n\tfor ; Tue, 12 Sep 2017 06:32:44 +0000 (UTC)","from [10.36.116.90] (ovpn-116-90.ams2.redhat.com [10.36.116.90])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 9C69070BD6;\n\tTue, 12 Sep 2017 06:32:43 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DD00DC04B928","To":"Eric Blake , qemu-devel@nongnu.org","References":"<20170911172022.4738-1-eblake@redhat.com>\n\t<20170911172022.4738-8-eblake@redhat.com>","From":"Thomas Huth ","Message-ID":"","Date":"Tue, 12 Sep 2017 08:32:42 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170911172022.4738-8-eblake@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tTue, 12 Sep 2017 06:32:45 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v7 07/38] libqtest: Inline\n\tqtest_query_target_endianness()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]