[{"id":1762029,"web_url":"http://patchwork.ozlabs.org/comment/1762029/","msgid":"","list_archive_url":null,"date":"2017-09-01T23:11:24","subject":"Re: [Qemu-devel] [PATCH v6 17/29] ahci-test: Drop dependence on\n\tglobal_qtest","submitter":{"id":64343,"url":"http://patchwork.ozlabs.org/api/people/64343/","name":"John Snow","email":"jsnow@redhat.com"},"content":"On 09/01/2017 02:03 PM, Eric Blake wrote:\n> Managing parallel connections to two different monitors via\n> the implicit global_qtest makes it hard to copy-and-paste code\n> to tests that are not aware of the implicit state; the\n> management of global_qtest is even harder to follow because\n> it was masked behind set_context().\n> \n> Instead, explicitly pass QTestState* around (generally, by\n> reusing the member already present in ahci->parent QOSState),\n> and call explicit qtest_* functions on all places that\n> interact with a monitor.\n> \n> We can assert that the conversion is correct by checking that\n> global_qtest remains NULL throughout the test (a later patch\n> that changes global_qtest to not be a public global variable\n> will drop the assertions).\n> \n> Bonus: there were several spots that were constructing a JSON\n> string, then passing that through qmp() as the format, rather\n> than directly using qmp() to construct the JSON. Fixing that\n> gets us one step closer to enabling -Wformat checking on\n> constructed JSON.\n> \n> Signed-off-by: Eric Blake \n\nReviewed-by: John Snow \n\nI think you've stumbled across why I was not a big fan of the implicit\ncontext versions of these functions.","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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jsnow@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 3xkZkt4WB5z9sMN\n\tfor ;\n\tSat, 2 Sep 2017 09:12:05 +1000 (AEST)","from localhost ([::1]:37830 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnv6Z-00067g-3p\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 19:12:03 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:59062)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnv68-00065D-E9\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 19:11:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnv63-0002B5-PM\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 19:11:36 -0400","from mx1.redhat.com ([209.132.183.28]:37112)\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 1dnv5z-00024H-8W; Fri, 01 Sep 2017 19:11:27 -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 2222B81E0E;\n\tFri, 1 Sep 2017 23:11:26 +0000 (UTC)","from [10.18.17.130] (dhcp-17-130.bos.redhat.com [10.18.17.130])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7DA325FCA2;\n\tFri, 1 Sep 2017 23:11:25 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2222B81E0E","To":"Eric Blake , qemu-devel@nongnu.org","References":"<20170901180340.30009-1-eblake@redhat.com>\n\t<20170901180340.30009-18-eblake@redhat.com>","From":"John Snow ","Message-ID":"","Date":"Fri, 1 Sep 2017 19:11:24 -0400","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<20170901180340.30009-18-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.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 01 Sep 2017 23:11:26 +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 v6 17/29] ahci-test: Drop dependence on\n\tglobal_qtest","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,\n\t\"open list:IDE\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1763192,"web_url":"http://patchwork.ozlabs.org/comment/1763192/","msgid":"<96c07533-e245-ccee-9632-b80821fad9be@redhat.com>","list_archive_url":null,"date":"2017-09-05T10:32:52","subject":"Re: [Qemu-devel] [PATCH v6 17/29] ahci-test: Drop dependence on\n\tglobal_qtest","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/","name":"Thomas Huth","email":"thuth@redhat.com"},"content":"On 01.09.2017 20:03, Eric Blake wrote:\n> Managing parallel connections to two different monitors via\n> the implicit global_qtest makes it hard to copy-and-paste code\n> to tests that are not aware of the implicit state; the\n> management of global_qtest is even harder to follow because\n> it was masked behind set_context().\n> \n> Instead, explicitly pass QTestState* around (generally, by\n> reusing the member already present in ahci->parent QOSState),\n> and call explicit qtest_* functions on all places that\n> interact with a monitor.\n> \n> We can assert that the conversion is correct by checking that\n> global_qtest remains NULL throughout the test (a later patch\n> that changes global_qtest to not be a public global variable\n> will drop the assertions).\n> \n> Bonus: there were several spots that were constructing a JSON\n> string, then passing that through qmp() as the format, rather\n> than directly using qmp() to construct the JSON. Fixing that\n> gets us one step closer to enabling -Wformat checking on\n> constructed JSON.\n> \n> Signed-off-by: Eric Blake \n> ---\n> tests/libqos/libqos.h | 1 -\n> tests/ahci-test.c | 83 +++++++++++++++++++++++-------------------------\n> tests/libqos/ahci.c | 45 +++++++++++++-------------\n> tests/libqos/libqos-pc.c | 2 +-\n> tests/libqos/libqos.c | 37 ++++++---------------\n> 5 files changed, 73 insertions(+), 95 deletions(-)\n\nMight be easier to review if you'd split the changes to libqos.c into a\nseparate patch. But anyway:\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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xmjk203nhz9s71\n\tfor ;\n\tTue, 5 Sep 2017 20:33:45 +1000 (AEST)","from localhost ([::1]:58000 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpBAt-0005pw-EW\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 06:33:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53203)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpBAW-0005p5-9v\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 06:33:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpBAR-0001Pi-MM\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 06:33:20 -0400","from mx1.redhat.com ([209.132.183.28]:39050)\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 1dpBAC-0001L0-Q3; Tue, 05 Sep 2017 06:33:00 -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 B2DAA495;\n\tTue, 5 Sep 2017 10:32:57 +0000 (UTC)","from [10.36.116.114] (ovpn-116-114.ams2.redhat.com [10.36.116.114])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 2D7D777E39;\n\tTue, 5 Sep 2017 10:32:53 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B2DAA495","To":"Eric Blake , qemu-devel@nongnu.org","References":"<20170901180340.30009-1-eblake@redhat.com>\n\t<20170901180340.30009-18-eblake@redhat.com>","From":"Thomas Huth ","Message-ID":"<96c07533-e245-ccee-9632-b80821fad9be@redhat.com>","Date":"Tue, 5 Sep 2017 12:32:52 +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":"<20170901180340.30009-18-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.29]);\n\tTue, 05 Sep 2017 10:32:57 +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 v6 17/29] ahci-test: Drop dependence on\n\tglobal_qtest","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:IDE\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1764934,"web_url":"http://patchwork.ozlabs.org/comment/1764934/","msgid":"<86b3bc7b-03bf-cbf6-e52e-df43e04a9c28@redhat.com>","list_archive_url":null,"date":"2017-09-07T20:19:54","subject":"Re: [Qemu-devel] [PATCH v6 17/29] ahci-test: Drop dependence on\n\tglobal_qtest","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/","name":"Eric Blake","email":"eblake@redhat.com"},"content":"On 09/05/2017 05:32 AM, Thomas Huth wrote:\n> On 01.09.2017 20:03, Eric Blake wrote:\n>> Managing parallel connections to two different monitors via\n>> the implicit global_qtest makes it hard to copy-and-paste code\n>> to tests that are not aware of the implicit state; the\n>> management of global_qtest is even harder to follow because\n>> it was masked behind set_context().\n>>\n\n>> ---\n>> tests/libqos/libqos.h | 1 -\n>> tests/ahci-test.c | 83 +++++++++++++++++++++++-------------------------\n>> tests/libqos/ahci.c | 45 +++++++++++++-------------\n>> tests/libqos/libqos-pc.c | 2 +-\n>> tests/libqos/libqos.c | 37 ++++++---------------\n>> 5 files changed, 73 insertions(+), 95 deletions(-)\n> \n> Might be easier to review if you'd split the changes to libqos.c into a\n> separate patch. But anyway:\n> \n> Reviewed-by: Thomas Huth \n\nI'll split it, even though it means dropping R-b on both halves of the\nsplit (so you can make sure the pieces still look sane).","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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.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 3xpBz166KRz9sBW\n\tfor ;\n\tFri, 8 Sep 2017 06:35:09 +1000 (AEST)","from localhost ([::1]:42195 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq3Vz-0004gz-Uu\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 16:35:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42146)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq3Hm-0001Ng-Fv\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:20:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq3Hh-0006N2-JJ\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:20:26 -0400","from mx1.redhat.com ([209.132.183.28]:52663)\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 1dq3HX-0006EG-CZ; Thu, 07 Sep 2017 16:20:11 -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 19BA981DFD;\n\tThu, 7 Sep 2017 20:20:09 +0000 (UTC)","from [10.10.120.228] (ovpn-120-228.rdu2.redhat.com [10.10.120.228])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id B83CA71D67;\n\tThu, 7 Sep 2017 20:19:55 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 19BA981DFD","To":"Thomas Huth , qemu-devel@nongnu.org","References":"<20170901180340.30009-1-eblake@redhat.com>\n\t<20170901180340.30009-18-eblake@redhat.com>\n\t<96c07533-e245-ccee-9632-b80821fad9be@redhat.com>","From":"Eric Blake ","Openpgp":"url=http://people.redhat.com/eblake/eblake.gpg","Organization":"Red Hat, Inc.","Message-ID":"<86b3bc7b-03bf-cbf6-e52e-df43e04a9c28@redhat.com>","Date":"Thu, 7 Sep 2017 15:19:54 -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":"<96c07533-e245-ccee-9632-b80821fad9be@redhat.com>","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\";\n\tboundary=\"EcStPP2evuWMxeghALqXPVwXFxMPks7Ks\"","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.25]);\n\tThu, 07 Sep 2017 20:20:09 +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 v6 17/29] ahci-test: Drop dependence on\n\tglobal_qtest","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:IDE\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]