[{"id":1766869,"web_url":"http://patchwork.ozlabs.org/comment/1766869/","msgid":"<1a629362-ebc5-7d28-463c-f6ec4639d29b@redhat.com>","list_archive_url":null,"date":"2017-09-12T10:45:26","subject":"Re: [Qemu-devel] [PATCH v7 31/38] libqtest: Merge qtest_clock_*()\n\twith clock_*()","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/","name":"Thomas Huth","email":"thuth@redhat.com"},"content":"On 11.09.2017 19:20, Eric Blake wrote:\n> Maintaining two layers of libqtest APIs, one that takes an explicit\n> QTestState object, and the other that uses the implicit global_qtest,\n> is annoying. In the interest of getting rid of global implicit\n> state and having less code to maintain, merge:\n> qtest_clock_set()\n> qtest_clock_step()\n> qtest_clock_step_next()\n> with their short counterparts. All callers that previously\n> used the short form now make it explicit that they are relying on\n> global_qtest, and later patches can then clean things up to remove\n> the global variable.\n> \n> Signed-off-by: Eric Blake \n> ---\n> tests/libqtest.h | 50 ++++----------------------------\n> tests/libqtest.c | 6 ++--\n> tests/e1000e-test.c | 2 +-\n> tests/fdc-test.c | 4 +--\n> tests/ide-test.c | 2 +-\n> tests/libqos/virtio.c | 8 +++---\n> tests/rtc-test.c | 74 ++++++++++++++++++++++++------------------------\n> tests/rtl8139-test.c | 10 +++----\n> tests/tco-test.c | 22 +++++++-------\n> tests/test-arm-mptimer.c | 25 +++++++++-------\n> tests/wdt_ib700-test.c | 12 ++++----\n> 11 files changed, 90 insertions(+), 125 deletions(-)\n> \n> diff --git a/tests/libqtest.h b/tests/libqtest.h\n> index 5651b77d2f..26d5f37bc9 100644\n> --- a/tests/libqtest.h\n> +++ b/tests/libqtest.h\n> @@ -417,17 +417,17 @@ void qtest_bufwrite(QTestState *s, uint64_t addr,\n> void qtest_memset(QTestState *s, uint64_t addr, uint8_t patt, size_t size);\n> \n> /**\n> - * qtest_clock_step_next:\n> + * clock_step_next:\n> * @s: #QTestState instance to operate on.\n> *\n> * Advance the QEMU_CLOCK_VIRTUAL to the next deadline.\n> *\n> * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.\n> */\n> -int64_t qtest_clock_step_next(QTestState *s);\n> +int64_t clock_step_next(QTestState *s);\n> \n> /**\n> - * qtest_clock_step:\n> + * clock_step:\n> * @s: QTestState instance to operate on.\n> * @step: Number of nanoseconds to advance the clock by.\n> *\n> @@ -435,10 +435,10 @@ int64_t qtest_clock_step_next(QTestState *s);\n> *\n> * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.\n> */\n> -int64_t qtest_clock_step(QTestState *s, int64_t step);\n> +int64_t clock_step(QTestState *s, int64_t step);\n> \n> /**\n> - * qtest_clock_set:\n> + * clock_set:\n> * @s: QTestState instance to operate on.\n> * @val: Nanoseconds value to advance the clock to.\n> *\n> @@ -446,7 +446,7 @@ int64_t qtest_clock_step(QTestState *s, int64_t step);\n> *\n> * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.\n> */\n> -int64_t qtest_clock_set(QTestState *s, int64_t val);\n> +int64_t clock_set(QTestState *s, int64_t val);\n Could we please keep the \"qtest\" prefix here and rather get rid of the\nother ones? Even if it's more to type, I prefer to have a proper prefix\nhere so that it is clear at the first sight that the functions belong to\nthe qtest framework.\n\n Thomas","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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xs1g35tNwz9sNV\n\tfor ;\n\tTue, 12 Sep 2017 20:46:07 +1000 (AEST)","from localhost ([::1]:34847 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drihh-0004WN-Vx\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 06:46:06 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41281)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drihL-0004Ul-W6\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 06:45:45 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drihK-0005jk-Fc\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 06:45:43 -0400","from mx1.redhat.com ([209.132.183.28]:38522)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drihD-0005eV-Hw; Tue, 12 Sep 2017 06:45:35 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 72E4983F3D;\n\tTue, 12 Sep 2017 10:45:34 +0000 (UTC)","from [10.40.204.137] (ovpn-204-137.brq.redhat.com [10.40.204.137])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 32FC85E1D9;\n\tTue, 12 Sep 2017 10:45:27 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 72E4983F3D","To":"Eric Blake , qemu-devel@nongnu.org","References":"<20170911172022.4738-1-eblake@redhat.com>\n\t<20170911172022.4738-32-eblake@redhat.com>","From":"Thomas Huth ","Message-ID":"<1a629362-ebc5-7d28-463c-f6ec4639d29b@redhat.com>","Date":"Tue, 12 Sep 2017 12:45:26 +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-32-eblake@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tTue, 12 Sep 2017 10:45:34 +0000 (UTC)","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 31/38] libqtest: Merge qtest_clock_*()\n\twith clock_*()","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, John Snow , armbru@redhat.com,\n\t\"open list:Floppy\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1767048,"web_url":"http://patchwork.ozlabs.org/comment/1767048/","msgid":"<2bd66aa2-6052-bf14-4f7d-c30fdcaff07d@redhat.com>","list_archive_url":null,"date":"2017-09-12T13:35:21","subject":"Re: [Qemu-devel] [PATCH v7 31/38] libqtest: Merge qtest_clock_*()\n\twith clock_*()","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/","name":"Eric Blake","email":"eblake@redhat.com"},"content":"On 09/12/2017 05:45 AM, Thomas Huth wrote:\n> On 11.09.2017 19:20, Eric Blake wrote:\n>> Maintaining two layers of libqtest APIs, one that takes an explicit\n>> QTestState object, and the other that uses the implicit global_qtest,\n>> is annoying. In the interest of getting rid of global implicit\n>> state and having less code to maintain, merge:\n>> qtest_clock_set()\n>> qtest_clock_step()\n>> qtest_clock_step_next()\n>> with their short counterparts. All callers that previously\n>> used the short form now make it explicit that they are relying on\n>> global_qtest, and later patches can then clean things up to remove\n>> the global variable.\n>>\n\n>> @@ -446,7 +446,7 @@ int64_t qtest_clock_step(QTestState *s, int64_t step);\n>> *\n>> * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.\n>> */\n>> -int64_t qtest_clock_set(QTestState *s, int64_t val);\n>> +int64_t clock_set(QTestState *s, int64_t val);\n> Could we please keep the \"qtest\" prefix here and rather get rid of the\n> other ones? Even if it's more to type, I prefer to have a proper prefix\n> here so that it is clear at the first sight that the functions belong to\n> the qtest framework.\n\nI suppose we can, although it makes more lines that are likely to bump\nup against 80 columns, and thus slightly more churn to reformat things\nto keep checkpatch happy. I like the shorter name, because less typing\nis easier to remember. I'd prefer a second opinion on naming before\ndoing anything about it though - Markus or Paolo, do you have any\npreference?","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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@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 3xs5RY0jgHz9s5L\n\tfor ;\n\tTue, 12 Sep 2017 23:36:25 +1000 (AEST)","from localhost ([::1]:35934 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drlMV-0000mH-8C\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 09:36:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46500)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drlLk-0000hV-UD\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:35:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drlLj-0003x4-Mn\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:35:36 -0400","from mx1.redhat.com ([209.132.183.28]:47406)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drlLa-0003tU-Mf; Tue, 12 Sep 2017 09:35:26 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 A8B697EA84;\n\tTue, 12 Sep 2017 13:35:25 +0000 (UTC)","from [10.10.120.44] (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 42C476F42E;\n\tTue, 12 Sep 2017 13:35:22 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A8B697EA84","To":"Thomas Huth , qemu-devel@nongnu.org","References":"<20170911172022.4738-1-eblake@redhat.com>\n\t<20170911172022.4738-32-eblake@redhat.com>\n\t<1a629362-ebc5-7d28-463c-f6ec4639d29b@redhat.com>","From":"Eric Blake ","Openpgp":"url=http://people.redhat.com/eblake/eblake.gpg","Organization":"Red Hat, Inc.","Message-ID":"<2bd66aa2-6052-bf14-4f7d-c30fdcaff07d@redhat.com>","Date":"Tue, 12 Sep 2017 08:35:21 -0500","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":"<1a629362-ebc5-7d28-463c-f6ec4639d29b@redhat.com>","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\";\n\tboundary=\"QGK3iQNGj2j9K6FRKd9MssJo4qpEPBgUs\"","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tTue, 12 Sep 2017 13:35:25 +0000 (UTC)","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","X-Content-Filtered-By":"Mailman/MimeDel 2.1.21","Subject":"Re: [Qemu-devel] [PATCH v7 31/38] libqtest: Merge qtest_clock_*()\n\twith clock_*()","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, John Snow , armbru@redhat.com,\n\t\"open list:Floppy\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1768337,"web_url":"http://patchwork.ozlabs.org/comment/1768337/","msgid":"","list_archive_url":null,"date":"2017-09-14T04:35:42","subject":"Re: [Qemu-devel] [PATCH v7 31/38] libqtest: Merge qtest_clock_*()\n\twith clock_*()","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/","name":"Thomas Huth","email":"thuth@redhat.com"},"content":"On 12.09.2017 15:35, Eric Blake wrote:\n> On 09/12/2017 05:45 AM, Thomas Huth wrote:\n>> On 11.09.2017 19:20, Eric Blake wrote:\n>>> Maintaining two layers of libqtest APIs, one that takes an explicit\n>>> QTestState object, and the other that uses the implicit global_qtest,\n>>> is annoying. In the interest of getting rid of global implicit\n>>> state and having less code to maintain, merge:\n>>> qtest_clock_set()\n>>> qtest_clock_step()\n>>> qtest_clock_step_next()\n>>> with their short counterparts. All callers that previously\n>>> used the short form now make it explicit that they are relying on\n>>> global_qtest, and later patches can then clean things up to remove\n>>> the global variable.\n>>>\n> \n>>> @@ -446,7 +446,7 @@ int64_t qtest_clock_step(QTestState *s, int64_t step);\n>>> *\n>>> * Returns: The current value of the QEMU_CLOCK_VIRTUAL in nanoseconds.\n>>> */\n>>> -int64_t qtest_clock_set(QTestState *s, int64_t val);\n>>> +int64_t clock_set(QTestState *s, int64_t val);\n>> Could we please keep the \"qtest\" prefix here and rather get rid of the\n>> other ones? Even if it's more to type, I prefer to have a proper prefix\n>> here so that it is clear at the first sight that the functions belong to\n>> the qtest framework.\n> \n> I suppose we can, although it makes more lines that are likely to bump\n> up against 80 columns, and thus slightly more churn to reformat things\n> to keep checkpatch happy. I like the shorter name, because less typing\n> is easier to remember. I'd prefer a second opinion on naming before\n> doing anything about it though - Markus or Paolo, do you have any\n> preference?\n\nIMHO you should at least keep the qtest prefix in patch 33/38 to avoid\nconfusion with the system definitions that have the same names (see \"man\n2 outb\" for example).\n\n Thomas","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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xt5Mg2lyVz9sCZ\n\tfor ;\n\tThu, 14 Sep 2017 14:36:30 +1000 (AEST)","from localhost ([::1]:45721 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsLt3-00005G-Tl\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 00:36:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53075)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsLsd-0008Vs-T8\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 00:36:00 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsLsc-0001NY-UJ\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 00:35:59 -0400","from mx1.redhat.com ([209.132.183.28]:58624)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsLsY-0001Jf-B4; Thu, 14 Sep 2017 00:35:54 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 350F183F3D;\n\tThu, 14 Sep 2017 04:35:53 +0000 (UTC)","from [10.36.116.28] (ovpn-116-28.ams2.redhat.com [10.36.116.28])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id A50885D763;\n\tThu, 14 Sep 2017 04:35:49 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 350F183F3D","To":"Eric Blake , qemu-devel@nongnu.org","References":"<20170911172022.4738-1-eblake@redhat.com>\n\t<20170911172022.4738-32-eblake@redhat.com>\n\t<1a629362-ebc5-7d28-463c-f6ec4639d29b@redhat.com>\n\t<2bd66aa2-6052-bf14-4f7d-c30fdcaff07d@redhat.com>","From":"Thomas Huth ","Message-ID":"","Date":"Thu, 14 Sep 2017 06:35: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":"<2bd66aa2-6052-bf14-4f7d-c30fdcaff07d@redhat.com>","Content-Type":"multipart/signed; micalg=pgp-sha1;\n\tprotocol=\"application/pgp-signature\";\n\tboundary=\"RUsmh0Avqr8U1VPXF1K317ab7tR72kSmv\"","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tThu, 14 Sep 2017 04:35:53 +0000 (UTC)","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 31/38] libqtest: Merge qtest_clock_*()\n\twith clock_*()","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, John Snow , armbru@redhat.com,\n\t\"open list:Floppy\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]