Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812498/?format=api
{ "id": 812498, "url": "http://patchwork.ozlabs.org/api/patches/812498/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-15-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-15-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-11T17:19:58", "name": "[v7,14/38] libqos: Use explicit QTestState for rtas operations", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1aae8a54832c887d95f3621bb5e6db8878420e2b", "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-15-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/812498/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812498/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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx08.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 3xrb1J64xNz9s81\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 03:45:24 +1000 (AEST)", "from localhost ([::1]:59450 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 1drSlu-0003l6-Tb\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 13:45:22 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:38409)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSOI-0007FM-U2\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:00 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSOH-0001Ay-6V\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:20:58 -0400", "from mx1.redhat.com ([209.132.183.28]:36368)\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 1drSOG-0001AS-UJ; Mon, 11 Sep 2017 13:20: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 EF6ECC0B8D57;\n\tMon, 11 Sep 2017 17:20:55 +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 BB6705D9CA;\n\tMon, 11 Sep 2017 17:20:54 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com EF6ECC0B8D57", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 11 Sep 2017 12:19:58 -0500", "Message-Id": "<20170911172022.4738-15-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.32]);\n\tMon, 11 Sep 2017 17:20: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": "[Qemu-devel] [PATCH v7 14/38] libqos: Use explicit QTestState for\n\trtas 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, armbru@redhat.com, Alexander Graf <agraf@suse.de>,\n\t\"open list:sPAPR\" <qemu-ppc@nongnu.org>, 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": "Drop one more client of global_qtest by teaching all rtas test\nfunctionality to pass in an explicit QTestState, adjusting all\ncallers.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv7: catch a couple more operations, drop R-b\n---\n tests/libqos/rtas.h | 9 ++++++---\n tests/libqos/pci-spapr.c | 18 ++++++++++++------\n tests/libqos/rtas.c | 36 ++++++++++++++++++++----------------\n tests/rtas-test.c | 2 +-\n 4 files changed, 39 insertions(+), 26 deletions(-)", "diff": "diff --git a/tests/libqos/rtas.h b/tests/libqos/rtas.h\nindex 498eb19230..e3d0f850a7 100644\n--- a/tests/libqos/rtas.h\n+++ b/tests/libqos/rtas.h\n@@ -7,9 +7,12 @@\n #define LIBQOS_RTAS_H\n #include \"libqos/malloc.h\"\n\n-int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm *tm, uint32_t *ns);\n-uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, uint64_t buid,\n+int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc,\n+ struct tm *tm, uint32_t *ns);\n+uint32_t qrtas_ibm_read_pci_config(QTestState *qts, QGuestAllocator *alloc,\n+ uint64_t buid,\n uint32_t addr, uint32_t size);\n-int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, uint64_t buid,\n+int qrtas_ibm_write_pci_config(QTestState *qts, QGuestAllocator *alloc,\n+ uint64_t buid,\n uint32_t addr, uint32_t size, uint32_t val);\n #endif /* LIBQOS_RTAS_H */\ndiff --git a/tests/libqos/pci-spapr.c b/tests/libqos/pci-spapr.c\nindex 9121913af6..4c29889b0b 100644\n--- a/tests/libqos/pci-spapr.c\n+++ b/tests/libqos/pci-spapr.c\n@@ -108,21 +108,24 @@ static uint8_t qpci_spapr_config_readb(QPCIBus *bus, int devfn, uint8_t offset)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n uint32_t config_addr = (devfn << 8) | offset;\n- return qrtas_ibm_read_pci_config(s->alloc, s->buid, config_addr, 1);\n+ return qrtas_ibm_read_pci_config(bus->qts, s->alloc, s->buid,\n+ config_addr, 1);\n }\n\n static uint16_t qpci_spapr_config_readw(QPCIBus *bus, int devfn, uint8_t offset)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n uint32_t config_addr = (devfn << 8) | offset;\n- return qrtas_ibm_read_pci_config(s->alloc, s->buid, config_addr, 2);\n+ return qrtas_ibm_read_pci_config(bus->qts, s->alloc, s->buid,\n+ config_addr, 2);\n }\n\n static uint32_t qpci_spapr_config_readl(QPCIBus *bus, int devfn, uint8_t offset)\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n uint32_t config_addr = (devfn << 8) | offset;\n- return qrtas_ibm_read_pci_config(s->alloc, s->buid, config_addr, 4);\n+ return qrtas_ibm_read_pci_config(bus->qts, s->alloc, s->buid,\n+ config_addr, 4);\n }\n\n static void qpci_spapr_config_writeb(QPCIBus *bus, int devfn, uint8_t offset,\n@@ -130,7 +133,8 @@ static void qpci_spapr_config_writeb(QPCIBus *bus, int devfn, uint8_t offset,\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n uint32_t config_addr = (devfn << 8) | offset;\n- qrtas_ibm_write_pci_config(s->alloc, s->buid, config_addr, 1, value);\n+ qrtas_ibm_write_pci_config(bus->qts, s->alloc, s->buid,\n+ config_addr, 1, value);\n }\n\n static void qpci_spapr_config_writew(QPCIBus *bus, int devfn, uint8_t offset,\n@@ -138,7 +142,8 @@ static void qpci_spapr_config_writew(QPCIBus *bus, int devfn, uint8_t offset,\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n uint32_t config_addr = (devfn << 8) | offset;\n- qrtas_ibm_write_pci_config(s->alloc, s->buid, config_addr, 2, value);\n+ qrtas_ibm_write_pci_config(bus->qts, s->alloc, s->buid,\n+ config_addr, 2, value);\n }\n\n static void qpci_spapr_config_writel(QPCIBus *bus, int devfn, uint8_t offset,\n@@ -146,7 +151,8 @@ static void qpci_spapr_config_writel(QPCIBus *bus, int devfn, uint8_t offset,\n {\n QPCIBusSPAPR *s = container_of(bus, QPCIBusSPAPR, bus);\n uint32_t config_addr = (devfn << 8) | offset;\n- qrtas_ibm_write_pci_config(s->alloc, s->buid, config_addr, 4, value);\n+ qrtas_ibm_write_pci_config(bus->qts, s->alloc, s->buid,\n+ config_addr, 4, value);\n }\n\n #define SPAPR_PCI_BASE (1ULL << 45)\ndiff --git a/tests/libqos/rtas.c b/tests/libqos/rtas.c\nindex 0269803ce0..d81ff4274d 100644\n--- a/tests/libqos/rtas.c\n+++ b/tests/libqos/rtas.c\n@@ -7,26 +7,28 @@\n #include \"libqtest.h\"\n #include \"libqos/rtas.h\"\n\n-static void qrtas_copy_args(uint64_t target_args, uint32_t nargs,\n- uint32_t *args)\n+static void qrtas_copy_args(QTestState *qts, uint64_t target_args,\n+ uint32_t nargs, uint32_t *args)\n {\n int i;\n\n for (i = 0; i < nargs; i++) {\n- writel(target_args + i * sizeof(uint32_t), args[i]);\n+ qtest_writel(qts, target_args + i * sizeof(uint32_t), args[i]);\n }\n }\n\n-static void qrtas_copy_ret(uint64_t target_ret, uint32_t nret, uint32_t *ret)\n+static void qrtas_copy_ret(QTestState *qts, uint64_t target_ret,\n+ uint32_t nret, uint32_t *ret)\n {\n int i;\n\n for (i = 0; i < nret; i++) {\n- ret[i] = readl(target_ret + i * sizeof(uint32_t));\n+ ret[i] = qtest_readl(qts, target_ret + i * sizeof(uint32_t));\n }\n }\n\n-static uint64_t qrtas_call(QGuestAllocator *alloc, const char *name,\n+static uint64_t qrtas_call(QTestState *qts, QGuestAllocator *alloc,\n+ const char *name,\n uint32_t nargs, uint32_t *args,\n uint32_t nret, uint32_t *ret)\n {\n@@ -36,10 +38,9 @@ static uint64_t qrtas_call(QGuestAllocator *alloc, const char *name,\n target_args = guest_alloc(alloc, nargs * sizeof(uint32_t));\n target_ret = guest_alloc(alloc, nret * sizeof(uint32_t));\n\n- qrtas_copy_args(target_args, nargs, args);\n- res = qtest_rtas_call(global_qtest, name,\n- nargs, target_args, nret, target_ret);\n- qrtas_copy_ret(target_ret, nret, ret);\n+ qrtas_copy_args(qts, target_args, nargs, args);\n+ res = qtest_rtas_call(qts, name, nargs, target_args, nret, target_ret);\n+ qrtas_copy_ret(qts, target_ret, nret, ret);\n\n guest_free(alloc, target_ret);\n guest_free(alloc, target_args);\n@@ -47,12 +48,13 @@ static uint64_t qrtas_call(QGuestAllocator *alloc, const char *name,\n return res;\n }\n\n-int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm *tm, uint32_t *ns)\n+int qrtas_get_time_of_day(QTestState *qts, QGuestAllocator *alloc,\n+ struct tm *tm, uint32_t *ns)\n {\n int res;\n uint32_t ret[8];\n\n- res = qrtas_call(alloc, \"get-time-of-day\", 0, NULL, 8, ret);\n+ res = qrtas_call(qts, alloc, \"get-time-of-day\", 0, NULL, 8, ret);\n if (res != 0) {\n return res;\n }\n@@ -70,7 +72,8 @@ int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm *tm, uint32_t *ns)\n return res;\n }\n\n-uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, uint64_t buid,\n+uint32_t qrtas_ibm_read_pci_config(QTestState *qts, QGuestAllocator *alloc,\n+ uint64_t buid,\n uint32_t addr, uint32_t size)\n {\n int res;\n@@ -80,7 +83,7 @@ uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, uint64_t buid,\n args[1] = buid >> 32;\n args[2] = buid & 0xffffffff;\n args[3] = size;\n- res = qrtas_call(alloc, \"ibm,read-pci-config\", 4, args, 2, ret);\n+ res = qrtas_call(qts, alloc, \"ibm,read-pci-config\", 4, args, 2, ret);\n if (res != 0) {\n return -1;\n }\n@@ -92,7 +95,8 @@ uint32_t qrtas_ibm_read_pci_config(QGuestAllocator *alloc, uint64_t buid,\n return ret[1];\n }\n\n-int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, uint64_t buid,\n+int qrtas_ibm_write_pci_config(QTestState *qts, QGuestAllocator *alloc,\n+ uint64_t buid,\n uint32_t addr, uint32_t size, uint32_t val)\n {\n int res;\n@@ -103,7 +107,7 @@ int qrtas_ibm_write_pci_config(QGuestAllocator *alloc, uint64_t buid,\n args[2] = buid & 0xffffffff;\n args[3] = size;\n args[4] = val;\n- res = qrtas_call(alloc, \"ibm,write-pci-config\", 5, args, 1, ret);\n+ res = qrtas_call(qts, alloc, \"ibm,write-pci-config\", 5, args, 1, ret);\n if (res != 0) {\n return -1;\n }\ndiff --git a/tests/rtas-test.c b/tests/rtas-test.c\nindex 276c87ef84..34a692163f 100644\n--- a/tests/rtas-test.c\n+++ b/tests/rtas-test.c\n@@ -16,7 +16,7 @@ static void test_rtas_get_time_of_day(void)\n qs = qtest_spapr_boot(\"-machine pseries\");\n\n t1 = time(NULL);\n- ret = qrtas_get_time_of_day(qs->alloc, &tm, &ns);\n+ ret = qrtas_get_time_of_day(qs->qts, qs->alloc, &tm, &ns);\n g_assert_cmpint(ret, ==, 0);\n t2 = mktimegm(&tm);\n g_assert(t2 - t1 < 5); /* 5 sec max to run the test */\n", "prefixes": [ "v7", "14/38" ] }