From nobody Mon Feb 9 08:10:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505151885425337.5092225403216; Mon, 11 Sep 2017 10:44:45 -0700 (PDT) Received: from localhost ([::1]:59447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drSlI-0003O7-Ne for importer@patchew.org; Mon, 11 Sep 2017 13:44:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drSOa-0007YM-Bb for qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drSOV-0001H1-D7 for qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38946) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drSOV-0001Gq-4z for qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 414C218FE54 for ; Mon, 11 Sep 2017 17:21:10 +0000 (UTC) Received: from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AD7A5D9CA; Mon, 11 Sep 2017 17:21:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 414C218FE54 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 11 Sep 2017 12:20:03 -0500 Message-Id: <20170911172022.4738-20-eblake@redhat.com> In-Reply-To: <20170911172022.4738-1-eblake@redhat.com> References: <20170911172022.4738-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 11 Sep 2017 17:21:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 19/38] ivshmem-test: Drop dependence on global_qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, thuth@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Managing parallel connections to two different monitors via the implicit global_qtest makes it hard to copy-and-paste code to tests that are not aware of the implicit state. Since we have already fixed qpci to avoid global_qtest, we can now simplify by not using global_qtest anywhere in ivshmem-test. We can assert that the conversion is correct by checking that global_qtest remains NULL throughout the test (a later patch that changes global_qtest to not be a public global variable will drop the assertions). Signed-off-by: Eric Blake --- v7: fix a couple more spots --- tests/ivshmem-test.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index d8f8530a4d..58eaf0cafb 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -71,13 +71,10 @@ static const char* reg2str(enum Reg reg) { static inline unsigned in_reg(IVState *s, enum Reg reg) { const char *name =3D reg2str(reg); - QTestState *qtest =3D global_qtest; unsigned res; - global_qtest =3D s->qs->qts; res =3D qpci_io_readl(s->dev, s->reg_bar, reg); g_test_message("*%s -> %x\n", name, res); - global_qtest =3D qtest; return res; } @@ -85,35 +82,25 @@ static inline unsigned in_reg(IVState *s, enum Reg reg) static inline void out_reg(IVState *s, enum Reg reg, unsigned v) { const char *name =3D reg2str(reg); - QTestState *qtest =3D global_qtest; - global_qtest =3D s->qs->qts; g_test_message("%x -> *%s\n", v, name); qpci_io_writel(s->dev, s->reg_bar, reg, v); - global_qtest =3D qtest; } static inline void read_mem(IVState *s, uint64_t off, void *buf, size_t le= n) { - QTestState *qtest =3D global_qtest; - - global_qtest =3D s->qs->qts; qpci_memread(s->dev, s->mem_bar, off, buf, len); - global_qtest =3D qtest; } static inline void write_mem(IVState *s, uint64_t off, const void *buf, size_t len) { - QTestState *qtest =3D global_qtest; - - global_qtest =3D s->qs->qts; qpci_memwrite(s->dev, s->mem_bar, off, buf, len); - global_qtest =3D qtest; } static void cleanup_vm(IVState *s) { + assert(!global_qtest); g_free(s->dev); qtest_shutdown(s->qs); } @@ -131,7 +118,6 @@ static void setup_vm_cmd(IVState *s, const char *cmd, b= ool msix) g_printerr("ivshmem-test tests are only available on x86 or ppc64\= n"); exit(EXIT_FAILURE); } - global_qtest =3D s->qs->qts; s->dev =3D get_device(s->qs->pcibus); s->reg_bar =3D qpci_iomap(s->dev, 0, &barsize); @@ -354,7 +340,6 @@ static void test_ivshmem_server(bool msi) g_assert_cmpint(vm1, !=3D, vm2); /* check number of MSI-X vectors */ - global_qtest =3D s1->qs->qts; if (msi) { ret =3D qpci_msix_table_size(s1->dev); g_assert_cmpuint(ret, =3D=3D, nvectors); @@ -377,7 +362,6 @@ static void test_ivshmem_server(bool msi) g_assert_cmpuint(ret, !=3D, 0); /* ping vm1 -> vm2 on vector 1 */ - global_qtest =3D s2->qs->qts; if (msi) { ret =3D qpci_msix_pending(s2->dev, 1); g_assert_cmpuint(ret, =3D=3D, 0); @@ -421,17 +405,19 @@ static void test_ivshmem_hotplug(void) { const char *arch =3D qtest_get_arch(); gchar *opts; + QTestState *qts; - qtest_start(""); + qts =3D qtest_init(""); opts =3D g_strdup_printf("'shm': '%s', 'size': '1M'", tmpshm); - qpci_plug_device_test(global_qtest, "ivshmem", "iv1", PCI_SLOT_HP, opt= s); + qpci_plug_device_test(qts, "ivshmem", "iv1", PCI_SLOT_HP, opts); if (strcmp(arch, "ppc64") !=3D 0) { - qpci_unplug_device_test(global_qtest, "iv1", PCI_SLOT_HP); + qpci_unplug_device_test(qts, "iv1", PCI_SLOT_HP); } - qtest_end(); + assert(!global_qtest); + qtest_quit(qts); g_free(opts); } --=20 2.13.5