Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812496/?format=api
{ "id": 812496, "url": "http://patchwork.ozlabs.org/api/patches/812496/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-20-eblake@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170911172022.4738-20-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-11T17:20:03", "name": "[v7,19/38] ivshmem-test: Drop dependence on global_qtest", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "946ef01687e6eec8f27ce0e02b0c07baca19907a", "submitter": { "id": 6591, "url": "http://patchwork.ozlabs.org/api/people/6591/?format=api", "name": "Eric Blake", "email": "eblake@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-20-eblake@redhat.com/mbox/", "series": [ { "id": 2534, "url": "http://patchwork.ozlabs.org/api/series/2534/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2534", "date": "2017-09-11T17:19:47", "name": "Preliminary libqtest cleanups", "version": 7, "mbox": "http://patchwork.ozlabs.org/series/2534/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812496/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812496/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3xrZzK4qr1z9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 03:43:41 +1000 (AEST)", "from localhost ([::1]:59441 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1drSkF-00025I-N4\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 13:43:39 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:38646)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSOa-0007YM-Bb\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:17 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSOV-0001H1-D7\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:16 -0400", "from mx1.redhat.com ([209.132.183.28]:38946)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>) id 1drSOV-0001Gq-4z\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:11 -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 414C218FE54\n\tfor <qemu-devel@nongnu.org>; Mon, 11 Sep 2017 17:21:10 +0000 (UTC)", "from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6AD7A5D9CA;\n\tMon, 11 Sep 2017 17:21:09 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 414C218FE54", "From": "Eric Blake <eblake@redhat.com>", "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\n\t(mx1.redhat.com [10.5.110.28]);\n\tMon, 11 Sep 2017 17:21:10 +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": "[Qemu-devel] [PATCH v7 19/38] ivshmem-test: Drop dependence on\n\tglobal_qtest", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "pbonzini@redhat.com, thuth@redhat.com, armbru@redhat.com", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Managing parallel connections to two different monitors via\nthe implicit global_qtest makes it hard to copy-and-paste code\nto tests that are not aware of the implicit state. Since we\nhave already fixed qpci to avoid global_qtest, we can now\nsimplify by not using global_qtest anywhere in ivshmem-test.\n\nWe can assert that the conversion is correct by checking that\nglobal_qtest remains NULL throughout the test (a later patch\nthat changes global_qtest to not be a public global variable\nwill drop the assertions).\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv7: fix a couple more spots\n---\n tests/ivshmem-test.c | 28 +++++++---------------------\n 1 file changed, 7 insertions(+), 21 deletions(-)", "diff": "diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c\nindex d8f8530a4d..58eaf0cafb 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,7 +118,6 @@ 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 = s->qs->qts;\n s->dev = get_device(s->qs->pcibus);\n\n s->reg_bar = qpci_iomap(s->dev, 0, &barsize);\n@@ -354,7 +340,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@@ -377,7 +362,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@@ -421,17 +405,19 @@ static void test_ivshmem_hotplug(void)\n {\n const char *arch = qtest_get_arch();\n gchar *opts;\n+ QTestState *qts;\n\n- qtest_start(\"\");\n+ qts = qtest_init(\"\");\n\n opts = g_strdup_printf(\"'shm': '%s', 'size': '1M'\", tmpshm);\n\n- qpci_plug_device_test(global_qtest, \"ivshmem\", \"iv1\", PCI_SLOT_HP, opts);\n+ qpci_plug_device_test(qts, \"ivshmem\", \"iv1\", PCI_SLOT_HP, opts);\n if (strcmp(arch, \"ppc64\") != 0) {\n- qpci_unplug_device_test(global_qtest, \"iv1\", PCI_SLOT_HP);\n+ qpci_unplug_device_test(qts, \"iv1\", PCI_SLOT_HP);\n }\n\n- qtest_end();\n+ assert(!global_qtest);\n+ qtest_quit(qts);\n g_free(opts);\n }\n\n", "prefixes": [ "v7", "19/38" ] }