{"id":808926,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808926/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","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":""},"msgid":"<20170901180340.30009-14-eblake@redhat.com>","date":"2017-09-01T18:03:24","name":"[v6,13/29] libqos: Use explicit QTestState for pci operations","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ec4987a3fffea86d5d9040e06f135fea8a58423f","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901180340.30009-14-eblake@redhat.com/mbox/","series":[{"id":1089,"url":"http://patchwork.ozlabs.org/api/1.0/series/1089/?format=json","date":"2017-09-01T18:03:12","name":"Preliminary libqtest cleanups","version":6,"mbox":"http://patchwork.ozlabs.org/series/1089/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808926/checks/","tags":{},"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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xkS8c0NZ1z9sMN\n\tfor ;\n\tSat, 2 Sep 2017 04:15:28 +1000 (AEST)","from localhost ([::1]:53144 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnqTW-0000mD-3u\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 14:15:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55867)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnqIa-0007DP-5X\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:09 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnqIY-0001hV-Aj\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:08 -0400","from mx1.redhat.com ([209.132.183.28]:36388)\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 1dnqIY-0001fz-1l; Fri, 01 Sep 2017 14:04:06 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 164E7356F6;\n\tFri, 1 Sep 2017 18:04:05 +0000 (UTC)","from red.redhat.com (ovpn-121-149.rdu2.redhat.com [10.10.121.149])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C962062929;\n\tFri, 1 Sep 2017 18:04:03 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 164E7356F6","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 13:03:24 -0500","Message-Id":"<20170901180340.30009-14-eblake@redhat.com>","In-Reply-To":"<20170901180340.30009-1-eblake@redhat.com>","References":"<20170901180340.30009-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 01 Sep 2017 18:04:05 +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 v6 13/29] libqos: Use explicit QTestState for\n\tpci operations","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, Alexander Graf ,\n\t\"open list:sPAPR\" , armbru@redhat.com,\n\tDavid Gibson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Now that the QPCIBus tracks QTestState, use that state instead\nof an implicit reliance on global_qtest.\n\nSigned-off-by: Eric Blake \n---\n tests/libqos/pci-pc.c | 47 ++++++++++++++++++++++++-----------------------\n tests/libqos/pci-spapr.c | 20 ++++++++++----------\n 2 files changed, 34 insertions(+), 33 deletions(-)","diff":"diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c\nindex 85b34c6d13..9545f881ee 100644\n--- a/tests/libqos/pci-pc.c\n+++ b/tests/libqos/pci-pc.c\n@@ -29,90 +29,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 cd9b8f52d2..d7b2aa75e6 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)\n","prefixes":["v6","13/29"]}