[{"id":1763198,"web_url":"http://patchwork.ozlabs.org/comment/1763198/","msgid":"<9e3d6358-fda6-edac-fa02-1bdbb30a8a91@redhat.com>","list_archive_url":null,"date":"2017-09-05T10:36:48","subject":"Re: [Qemu-devel] [PATCH v6 18/29] ivshmem-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. Since we\n> have already fixed qpci to avoid global_qtest, we can now\n> simplify by not using global_qtest anywhere in ivshmem-test.\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> Signed-off-by: Eric Blake \n> ---\n> tests/ivshmem-test.c | 18 ++----------------\n> 1 file changed, 2 insertions(+), 16 deletions(-)\n> \n> diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c\n> index 37763425ee..b9e0f573f6 100644\n> --- a/tests/ivshmem-test.c\n> +++ b/tests/ivshmem-test.c\n> @@ -71,13 +71,10 @@ static const char* reg2str(enum Reg reg) {\n> static inline unsigned in_reg(IVState *s, enum Reg reg)\n> {\n> const char *name = reg2str(reg);\n> - QTestState *qtest = global_qtest;\n> unsigned res;\n> \n> - global_qtest = s->qs->qts;\n> res = qpci_io_readl(s->dev, s->reg_bar, reg);\n> g_test_message(\"*%s -> %x\\n\", name, res);\n> - global_qtest = qtest;\n> \n> return res;\n> }\n> @@ -85,35 +82,25 @@ static inline unsigned in_reg(IVState *s, enum Reg reg)\n> static inline void out_reg(IVState *s, enum Reg reg, unsigned v)\n> {\n> const char *name = reg2str(reg);\n> - QTestState *qtest = global_qtest;\n> \n> - global_qtest = s->qs->qts;\n> g_test_message(\"%x -> *%s\\n\", v, name);\n> qpci_io_writel(s->dev, s->reg_bar, reg, v);\n> - global_qtest = qtest;\n> }\n> \n> static inline void read_mem(IVState *s, uint64_t off, void *buf, size_t len)\n> {\n> - QTestState *qtest = global_qtest;\n> -\n> - global_qtest = s->qs->qts;\n> qpci_memread(s->dev, s->mem_bar, off, buf, len);\n> - global_qtest = qtest;\n> }\n> \n> static inline void write_mem(IVState *s, uint64_t off,\n> const void *buf, size_t len)\n> {\n> - QTestState *qtest = global_qtest;\n> -\n> - global_qtest = s->qs->qts;\n> qpci_memwrite(s->dev, s->mem_bar, off, buf, len);\n> - global_qtest = qtest;\n> }\n> \n> static void cleanup_vm(IVState *s)\n> {\n> + assert(!global_qtest);\n> g_free(s->dev);\n> qtest_shutdown(s->qs);\n> }\n> @@ -131,6 +118,7 @@ static void setup_vm_cmd(IVState *s, const char *cmd, bool msix)\n> g_printerr(\"ivshmem-test tests are only available on x86 or ppc64\\n\");\n> exit(EXIT_FAILURE);\n> }\n> + global_qtest = NULL;\n> s->dev = get_device(s->qs->pcibus);\n> \n> s->reg_bar = qpci_iomap(s->dev, 0, &barsize);\n> @@ -353,7 +341,6 @@ static void test_ivshmem_server(bool msi)\n> g_assert_cmpint(vm1, !=, vm2);\n> \n> /* check number of MSI-X vectors */\n> - global_qtest = s1->qs->qts;\n> if (msi) {\n> ret = qpci_msix_table_size(s1->dev);\n> g_assert_cmpuint(ret, ==, nvectors);\n> @@ -376,7 +363,6 @@ static void test_ivshmem_server(bool msi)\n> g_assert_cmpuint(ret, !=, 0);\n> \n> /* ping vm1 -> vm2 on vector 1 */\n> - global_qtest = s2->qs->qts;\n> if (msi) {\n> ret = qpci_msix_pending(s2->dev, 1);\n> g_assert_cmpuint(ret, ==, 0);\n> \n\nOMG, now I see why you want to get rid of this global_test stuff ...\nthat was really ugly!\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 3xmjpP0366z9sNr\n\tfor ;\n\tTue, 5 Sep 2017 20:37:32 +1000 (AEST)","from localhost ([::1]:58015 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpBEY-0007PW-Tx\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 06:37:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55080)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpBE6-0007P8-KV\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 06:37:10 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpBE1-00045S-RV\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 06:37:02 -0400","from mx1.redhat.com ([209.132.183.28]:47108)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpBE1-00044s-Jo\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 06:36:57 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 94FB3129A\n\tfor ; Tue, 5 Sep 2017 10:36:56 +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 AB52E7DEE2;\n\tTue, 5 Sep 2017 10:36:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 94FB3129A","To":"Eric Blake , qemu-devel@nongnu.org","References":"<20170901180340.30009-1-eblake@redhat.com>\n\t<20170901180340.30009-19-eblake@redhat.com>","From":"Thomas Huth ","Message-ID":"<9e3d6358-fda6-edac-fa02-1bdbb30a8a91@redhat.com>","Date":"Tue, 5 Sep 2017 12:36:48 +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-19-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.14","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:36:56 +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 18/29] ivshmem-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","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]