Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812487/?format=api
{ "id": 812487, "url": "http://patchwork.ozlabs.org/api/patches/812487/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-12-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-12-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-11T17:19:55", "name": "[v7,11/38] libqos: Use explicit QTestState for pci operations", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e87a6ff45a15c2a01e9f75ef079d14c7873ad89b", "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-12-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/812487/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812487/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx07.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 3xrZqp1nqVz9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 03:37:10 +1000 (AEST)", "from localhost ([::1]:59405 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 1drSdw-00051q-AL\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 13:37:08 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:38419)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSOJ-0007G8-Ja\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:01 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSOH-0001B7-BE\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:20:59 -0400", "from mx1.redhat.com ([209.132.183.28]:58916)\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>)\n\tid 1drSOB-000150-G6; Mon, 11 Sep 2017 13:20:51 -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 997D8C0DA34D;\n\tMon, 11 Sep 2017 17:20:50 +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 AD8F65D969;\n\tMon, 11 Sep 2017 17:20:48 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 997D8C0DA34D", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 11 Sep 2017 12:19:55 -0500", "Message-Id": "<20170911172022.4738-12-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.31]);\n\tMon, 11 Sep 2017 17:20:50 +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 11/38] libqos: Use explicit QTestState for\n\tpci operations", "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": "thuth@redhat.com, \"open list:virtio-blk\" <qemu-block@nongnu.org>,\n\tAmit Shah <amit@kernel.org>, Jason Wang <jasowang@redhat.com>,\n\tarmbru@redhat.com, Alexander Graf <agraf@suse.de>,\n\t\"open list:sPAPR\" <qemu-ppc@nongnu.org>,\n\tStefan Hajnoczi <stefanha@redhat.com>, pbonzini@redhat.com,\n\tDavid Gibson <david@gibson.dropbear.id.au>", "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": "Now that the QPCIBus tracks QTestState, use that state instead\nof an implicit reliance on global_qtest.\n\nPass an explicit QTestState to the remaining few functions in\nthe same file that don't have direct access to QPCIBus, and\nupdate all callers.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv7: more sites with explicit state, drop R-b\n---\n tests/libqos/pci.h | 4 ++--\n tests/e1000e-test.c | 4 ++--\n tests/ivshmem-test.c | 4 ++--\n tests/libqos/pci-pc.c | 47 ++++++++++++++++++++++++-----------------------\n tests/libqos/pci-spapr.c | 20 ++++++++++----------\n tests/libqos/pci.c | 19 +++++++------------\n tests/virtio-blk-test.c | 4 ++--\n tests/virtio-net-test.c | 5 +++--\n tests/virtio-rng-test.c | 5 +++--\n 9 files changed, 55 insertions(+), 57 deletions(-)", "diff": "diff --git a/tests/libqos/pci.h b/tests/libqos/pci.h\nindex fdda7eca6e..2943186819 100644\n--- a/tests/libqos/pci.h\n+++ b/tests/libqos/pci.h\n@@ -109,7 +109,7 @@ QPCIBar qpci_iomap(QPCIDevice *dev, int barno, uint64_t *sizeptr);\n void qpci_iounmap(QPCIDevice *dev, QPCIBar addr);\n QPCIBar qpci_legacy_iomap(QPCIDevice *dev, uint16_t addr);\n\n-void qpci_plug_device_test(const char *driver, const char *id,\n+void qpci_plug_device_test(QTestState *qts, const char *driver, const char *id,\n uint8_t slot, const char *opts);\n-void qpci_unplug_device_test(const char *id, uint8_t slot);\n+void qpci_unplug_device_test(QTestState *qts, const char *id, uint8_t slot);\n #endif\ndiff --git a/tests/e1000e-test.c b/tests/e1000e-test.c\nindex 4c663a3019..3cc081941e 100644\n--- a/tests/e1000e-test.c\n+++ b/tests/e1000e-test.c\n@@ -460,8 +460,8 @@ static void test_e1000e_hotplug(gconstpointer data)\n\n qtest_start(\"-device e1000e\");\n\n- qpci_plug_device_test(\"e1000e\", \"e1000e_net\", slot, NULL);\n- qpci_unplug_device_test(\"e1000e_net\", slot);\n+ qpci_plug_device_test(global_qtest, \"e1000e\", \"e1000e_net\", slot, NULL);\n+ qpci_unplug_device_test(global_qtest, \"e1000e_net\", slot);\n\n qtest_end();\n }\ndiff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c\nindex 8c9ed6a568..d35c922254 100644\n--- a/tests/ivshmem-test.c\n+++ b/tests/ivshmem-test.c\n@@ -425,9 +425,9 @@ static void test_ivshmem_hotplug(void)\n\n opts = g_strdup_printf(\"'shm': '%s', 'size': '1M'\", tmpshm);\n\n- qpci_plug_device_test(\"ivshmem\", \"iv1\", PCI_SLOT_HP, opts);\n+ qpci_plug_device_test(global_qtest, \"ivshmem\", \"iv1\", PCI_SLOT_HP, opts);\n if (strcmp(arch, \"ppc64\") != 0) {\n- qpci_unplug_device_test(\"iv1\", PCI_SLOT_HP);\n+ qpci_unplug_device_test(global_qtest, \"iv1\", PCI_SLOT_HP);\n }\n\n qtest_end();\ndiff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c\nindex 6305d142a5..e5af083f0c 100644\n--- a/tests/libqos/pci-pc.c\n+++ b/tests/libqos/pci-pc.c\n@@ -26,90 +26,91 @@ typedef struct QPCIBusPC\n\n static uint8_t qpci_pc_pio_readb(QPCIBus *bus, uint32_t addr)\n {\n- return inb(addr);\n+ return qtest_inb(bus->qts, addr);\n }\n\n static void qpci_pc_pio_writeb(QPCIBus *bus, uint32_t addr, uint8_t val)\n {\n- outb(addr, val);\n+ qtest_outb(bus->qts, addr, val);\n }\n\n static uint16_t qpci_pc_pio_readw(QPCIBus *bus, uint32_t addr)\n {\n- return inw(addr);\n+ return qtest_inw(bus->qts, addr);\n }\n\n static void qpci_pc_pio_writew(QPCIBus *bus, uint32_t addr, uint16_t val)\n {\n- outw(addr, val);\n+ qtest_outw(bus->qts, addr, val);\n }\n\n static uint32_t qpci_pc_pio_readl(QPCIBus *bus, uint32_t addr)\n {\n- return inl(addr);\n+ return qtest_inl(bus->qts, addr);\n }\n\n static void qpci_pc_pio_writel(QPCIBus *bus, uint32_t addr, uint32_t val)\n {\n- outl(addr, val);\n+ qtest_outl(bus->qts, addr, val);\n }\n\n static uint64_t qpci_pc_pio_readq(QPCIBus *bus, uint32_t addr)\n {\n- return (uint64_t)inl(addr) + ((uint64_t)inl(addr + 4) << 32);\n+ return (uint64_t)qtest_inl(bus->qts, addr) +\n+ ((uint64_t)qtest_inl(bus->qts, addr + 4) << 32);\n }\n\n static void qpci_pc_pio_writeq(QPCIBus *bus, uint32_t addr, uint64_t val)\n {\n- outl(addr, val & 0xffffffff);\n- outl(addr + 4, val >> 32);\n+ qtest_outl(bus->qts, addr, val & 0xffffffff);\n+ qtest_outl(bus->qts, addr + 4, val >> 32);\n }\n\n static void qpci_pc_memread(QPCIBus *bus, uint32_t addr, void *buf, size_t len)\n {\n- memread(addr, buf, len);\n+ qtest_memread(bus->qts, addr, buf, len);\n }\n\n static void qpci_pc_memwrite(QPCIBus *bus, uint32_t addr,\n const void *buf, size_t len)\n {\n- memwrite(addr, buf, len);\n+ qtest_memwrite(bus->qts, addr, buf, len);\n }\n\n static uint8_t qpci_pc_config_readb(QPCIBus *bus, int devfn, uint8_t offset)\n {\n- outl(0xcf8, (1U << 31) | (devfn << 8) | offset);\n- return inb(0xcfc);\n+ qtest_outl(bus->qts, 0xcf8, (1U << 31) | (devfn << 8) | offset);\n+ return qtest_inb(bus->qts, 0xcfc);\n }\n\n static uint16_t qpci_pc_config_readw(QPCIBus *bus, int devfn, uint8_t offset)\n {\n- outl(0xcf8, (1U << 31) | (devfn << 8) | offset);\n- return inw(0xcfc);\n+ qtest_outl(bus->qts, 0xcf8, (1U << 31) | (devfn << 8) | offset);\n+ return qtest_inw(bus->qts, 0xcfc);\n }\n\n static uint32_t qpci_pc_config_readl(QPCIBus *bus, int devfn, uint8_t offset)\n {\n- outl(0xcf8, (1U << 31) | (devfn << 8) | offset);\n- return inl(0xcfc);\n+ qtest_outl(bus->qts, 0xcf8, (1U << 31) | (devfn << 8) | offset);\n+ return qtest_inl(bus->qts, 0xcfc);\n }\n\n static void qpci_pc_config_writeb(QPCIBus *bus, int devfn, uint8_t offset, uint8_t value)\n {\n- outl(0xcf8, (1U << 31) | (devfn << 8) | offset);\n- outb(0xcfc, value);\n+ qtest_outl(bus->qts, 0xcf8, (1U << 31) | (devfn << 8) | offset);\n+ qtest_outb(bus->qts, 0xcfc, value);\n }\n\n static void qpci_pc_config_writew(QPCIBus *bus, int devfn, uint8_t offset, uint16_t value)\n {\n- outl(0xcf8, (1U << 31) | (devfn << 8) | offset);\n- outw(0xcfc, value);\n+ qtest_outl(bus->qts, 0xcf8, (1U << 31) | (devfn << 8) | offset);\n+ qtest_outw(bus->qts, 0xcfc, value);\n }\n\n static void qpci_pc_config_writel(QPCIBus *bus, int devfn, uint8_t offset, uint32_t value)\n {\n- outl(0xcf8, (1U << 31) | (devfn << 8) | offset);\n- outl(0xcfc, value);\n+ qtest_outl(bus->qts, 0xcf8, (1U << 31) | (devfn << 8) | offset);\n+ qtest_outl(bus->qts, 0xcfc, value);\n }\n\n QPCIBus *qpci_init_pc(QTestState *qts, QGuestAllocator *alloc)\ndiff --git a/tests/libqos/pci-spapr.c b/tests/libqos/pci-spapr.c\nindex ef52fcbe2b..9121913af6 100644\n--- a/tests/libqos/pci-spapr.c\n+++ b/tests/libqos/pci-spapr.c\n@@ -45,63 +45,63 @@ typedef struct QPCIBusSPAPR {\n static uint8_t qpci_spapr_pio_readb(QPCIBus *bus, uint32_t addr)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- return readb(s->pio_cpu_base + addr);\n+ return qtest_readb(bus->qts, s->pio_cpu_base + addr);\n }\n\n static void qpci_spapr_pio_writeb(QPCIBus *bus, uint32_t addr, uint8_t val)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- writeb(s->pio_cpu_base + addr, val);\n+ qtest_writeb(bus->qts, s->pio_cpu_base + addr, val);\n }\n\n static uint16_t qpci_spapr_pio_readw(QPCIBus *bus, uint32_t addr)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- return bswap16(readw(s->pio_cpu_base + addr));\n+ return bswap16(qtest_readw(bus->qts, s->pio_cpu_base + addr));\n }\n\n static void qpci_spapr_pio_writew(QPCIBus *bus, uint32_t addr, uint16_t val)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- writew(s->pio_cpu_base + addr, bswap16(val));\n+ qtest_writew(bus->qts, s->pio_cpu_base + addr, bswap16(val));\n }\n\n static uint32_t qpci_spapr_pio_readl(QPCIBus *bus, uint32_t addr)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- return bswap32(readl(s->pio_cpu_base + addr));\n+ return bswap32(qtest_readl(bus->qts, s->pio_cpu_base + addr));\n }\n\n static void qpci_spapr_pio_writel(QPCIBus *bus, uint32_t addr, uint32_t val)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- writel(s->pio_cpu_base + addr, bswap32(val));\n+ qtest_writel(bus->qts, s->pio_cpu_base + addr, bswap32(val));\n }\n\n static uint64_t qpci_spapr_pio_readq(QPCIBus *bus, uint32_t addr)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- return bswap64(readq(s->pio_cpu_base + addr));\n+ return bswap64(qtest_readq(bus->qts, s->pio_cpu_base + addr));\n }\n\n static void qpci_spapr_pio_writeq(QPCIBus *bus, uint32_t addr, uint64_t val)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- writeq(s->pio_cpu_base + addr, bswap64(val));\n+ qtest_writeq(bus->qts, s->pio_cpu_base + addr, bswap64(val));\n }\n\n static void qpci_spapr_memread(QPCIBus *bus, uint32_t addr,\n void *buf, size_t len)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- memread(s->mmio32_cpu_base + addr, buf, len);\n+ qtest_memread(bus->qts, s->mmio32_cpu_base + addr, buf, len);\n }\n\n static void qpci_spapr_memwrite(QPCIBus *bus, uint32_t addr,\n const void *buf, size_t len)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n- memwrite(s->mmio32_cpu_base + addr, buf, len);\n+ qtest_memwrite(bus->qts, s->mmio32_cpu_base + addr, buf, len);\n }\n\n static uint8_t qpci_spapr_config_readb(QPCIBus *bus, int devfn, uint8_t offset)\ndiff --git a/tests/libqos/pci.c b/tests/libqos/pci.c\nindex 9f36ec73ef..d3ee21fdfd 100644\n--- a/tests/libqos/pci.c\n+++ b/tests/libqos/pci.c\n@@ -394,7 +394,7 @@ QPCIBar qpci_legacy_iomap(QPCIDevice *dev, uint16_t addr)\n return bar;\n }\n\n-void qpci_plug_device_test(const char *driver, const char *id,\n+void qpci_plug_device_test(QTestState *qts, const char *driver, const char *id,\n uint8_t slot, const char *opts)\n {\n QDict *response;\n@@ -409,29 +409,24 @@ void qpci_plug_device_test(const char *driver, const char *id,\n \"}}\", driver, slot,\n opts ? opts : \"\", opts ? \",\" : \"\",\n id);\n- response = qmp(cmd);\n+ response = qtest_qmp(qts, cmd);\n g_free(cmd);\n g_assert(response);\n g_assert(!qdict_haskey(response, \"error\"));\n QDECREF(response);\n }\n\n-void qpci_unplug_device_test(const char *id, uint8_t slot)\n+void qpci_unplug_device_test(QTestState *qts, const char *id, uint8_t slot)\n {\n QDict *response;\n- char *cmd;\n\n- cmd = g_strdup_printf(\"{'execute': 'device_del',\"\n- \" 'arguments': {\"\n- \" 'id': '%s'\"\n- \"}}\", id);\n- response = qmp(cmd);\n- g_free(cmd);\n+ response = qtest_qmp(qts, \"{'execute': 'device_del',\"\n+ \" 'arguments': { 'id': %s }}\", id);\n g_assert(response);\n g_assert(!qdict_haskey(response, \"error\"));\n QDECREF(response);\n\n- outb(ACPI_PCIHP_ADDR + PCI_EJ_BASE, 1 << slot);\n+ qtest_outb(qts, ACPI_PCIHP_ADDR + PCI_EJ_BASE, 1 << slot);\n\n- qmp_eventwait(\"DEVICE_DELETED\");\n+ qtest_qmp_eventwait(qts, \"DEVICE_DELETED\");\n }\ndiff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c\nindex 8441ab91ed..2d38c49bfe 100644\n--- a/tests/virtio-blk-test.c\n+++ b/tests/virtio-blk-test.c\n@@ -662,7 +662,7 @@ static void pci_hotplug(void)\n qs = pci_test_start();\n\n /* plug secondary disk */\n- qpci_plug_device_test(\"virtio-blk-pci\", \"drv1\", PCI_SLOT_HP,\n+ qpci_plug_device_test(global_qtest, \"virtio-blk-pci\", \"drv1\", PCI_SLOT_HP,\n \"'drive': 'drive1'\");\n\n dev = virtio_blk_pci_init(qs->pcibus, PCI_SLOT_HP);\n@@ -672,7 +672,7 @@ static void pci_hotplug(void)\n\n /* unplug secondary disk */\n if (strcmp(arch, \"i386\") == 0 || strcmp(arch, \"x86_64\") == 0) {\n- qpci_unplug_device_test(\"drv1\", PCI_SLOT_HP);\n+ qpci_unplug_device_test(global_qtest, \"drv1\", PCI_SLOT_HP);\n }\n qtest_shutdown(qs);\n }\ndiff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c\nindex 24e0f774f0..8b43d3dd65 100644\n--- a/tests/virtio-net-test.c\n+++ b/tests/virtio-net-test.c\n@@ -245,10 +245,11 @@ static void hotplug(void)\n\n qtest_start(\"-device virtio-net-pci\");\n\n- qpci_plug_device_test(\"virtio-net-pci\", \"net1\", PCI_SLOT_HP, NULL);\n+ qpci_plug_device_test(global_qtest, \"virtio-net-pci\", \"net1\",\n+ PCI_SLOT_HP, NULL);\n\n if (strcmp(arch, \"i386\") == 0 || strcmp(arch, \"x86_64\") == 0) {\n- qpci_unplug_device_test(\"net1\", PCI_SLOT_HP);\n+ qpci_unplug_device_test(global_qtest, \"net1\", PCI_SLOT_HP);\n }\n\n test_end();\ndiff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c\nindex fc4a36474b..0e21125cb4 100644\n--- a/tests/virtio-rng-test.c\n+++ b/tests/virtio-rng-test.c\n@@ -22,10 +22,11 @@ static void hotplug(void)\n {\n const char *arch = qtest_get_arch();\n\n- qpci_plug_device_test(\"virtio-rng-pci\", \"rng1\", PCI_SLOT_HP, NULL);\n+ qpci_plug_device_test(global_qtest, \"virtio-rng-pci\", \"rng1\",\n+ PCI_SLOT_HP, NULL);\n\n if (strcmp(arch, \"i386\") == 0 || strcmp(arch, \"x86_64\") == 0) {\n- qpci_unplug_device_test(\"rng1\", PCI_SLOT_HP);\n+ qpci_unplug_device_test(global_qtest, \"rng1\", PCI_SLOT_HP);\n }\n }\n\n", "prefixes": [ "v7", "11/38" ] }