Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807713/?format=api
{ "id": 807713, "url": "http://patchwork.ozlabs.org/api/patches/807713/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830163609.50260-6-pasic@linux.vnet.ibm.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": "<20170830163609.50260-6-pasic@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-08-30T16:36:05", "name": "[5/9] s390x: refactor error handling for XSCH handler", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ab83a29ac87b48c0ff241054c78296c5e81e7138", "submitter": { "id": 68297, "url": "http://patchwork.ozlabs.org/api/people/68297/?format=api", "name": "Halil Pasic", "email": "pasic@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830163609.50260-6-pasic@linux.vnet.ibm.com/mbox/", "series": [ { "id": 648, "url": "http://patchwork.ozlabs.org/api/series/648/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=648", "date": "2017-08-30T16:36:02", "name": "", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/648/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807713/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807713/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>)", "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 3xjBF32CHnz9sPt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 02:44:55 +1000 (AEST)", "from localhost ([::1]:51573 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 1dn66n-00050V-4U\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 12:44:53 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:50204)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <pasic@linux.vnet.ibm.com>) id 1dn5ym-0007I3-AG\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:36:39 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <pasic@linux.vnet.ibm.com>) id 1dn5yj-0006JJ-4n\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:36:36 -0400", "from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36591)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <pasic@linux.vnet.ibm.com>)\n\tid 1dn5yi-0006Io-SN\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:36:33 -0400", "from pps.filterd (m0098399.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7UGYBjx061708\n\tfor <qemu-devel@nongnu.org>; Wed, 30 Aug 2017 12:36:31 -0400", "from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cnyf4p6a9-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Wed, 30 Aug 2017 12:36:31 -0400", "from localhost\n\tby e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <pasic@linux.vnet.ibm.com>;\n\tWed, 30 Aug 2017 17:36:28 +0100", "from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198)\n\tby e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tWed, 30 Aug 2017 17:36:26 +0100", "from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7UGaQ1f21037306; Wed, 30 Aug 2017 16:36:26 GMT", "from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id CB40E5203F;\n\tWed, 30 Aug 2017 16:31:52 +0100 (BST)", "from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 9D87E52043; \n\tWed, 30 Aug 2017 16:31:52 +0100 (BST)" ], "From": "Halil Pasic <pasic@linux.vnet.ibm.com>", "To": "Cornelia Huck <cohuck@redhat.com>", "Date": "Wed, 30 Aug 2017 18:36:05 +0200", "X-Mailer": "git-send-email 2.13.5", "In-Reply-To": "<20170830163609.50260-1-pasic@linux.vnet.ibm.com>", "References": "<20170830163609.50260-1-pasic@linux.vnet.ibm.com>", "X-TM-AS-GCONF": "00", "x-cbid": "17083016-0040-0000-0000-000003F46E80", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17083016-0041-0000-0000-00002094D2E7", "Message-Id": "<20170830163609.50260-6-pasic@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-30_07:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708300251", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]", "X-Received-From": "148.163.156.1", "Subject": "[Qemu-devel] [PATCH 5/9] s390x: refactor error handling for XSCH\n\thandler", "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": "Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>,\n\tHalil Pasic <pasic@linux.vnet.ibm.com>,\n\tPierre Morel <pmorel@linux.vnet.ibm.com>, qemu-devel@nongnu.org", "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": "Simplify the error handling of the XSCH handler avoiding arbitrary and\ncryptic error codes being mapped to what a subchannel is supposed to do.\nLet the code detecting the condition tell how it's to be handled in a\nless ambiguous way.\n\nSigned-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>\nAcked-by: Pierre Morel<pmorel@linux.vnet.ibm.com>\n---\n hw/s390x/css.c | 19 +++++++------------\n include/hw/s390x/css.h | 2 +-\n target/s390x/ioinst.c | 27 +++++++++------------------\n 3 files changed, 17 insertions(+), 31 deletions(-)", "diff": "diff --git a/hw/s390x/css.c b/hw/s390x/css.c\nindex 1102642c10..7880c2c025 100644\n--- a/hw/s390x/css.c\n+++ b/hw/s390x/css.c\n@@ -1237,15 +1237,14 @@ out:\n return ret;\n }\n \n-int css_do_xsch(SubchDev *sch)\n+void css_do_xsch(SubchDev *sch)\n {\n SCSW *s = &sch->curr_status.scsw;\n PMCW *p = &sch->curr_status.pmcw;\n- int ret;\n \n if (~(p->flags) & (PMCW_FLAGS_MASK_DNV | PMCW_FLAGS_MASK_ENA)) {\n- ret = -ENODEV;\n- goto out;\n+ sch->iret.cc = 3;\n+ return;\n }\n \n if (!(s->ctrl & SCSW_CTRL_MASK_FCTL) ||\n@@ -1253,13 +1252,13 @@ int css_do_xsch(SubchDev *sch)\n (!(s->ctrl &\n (SCSW_ACTL_RESUME_PEND | SCSW_ACTL_START_PEND | SCSW_ACTL_SUSP))) ||\n (s->ctrl & SCSW_ACTL_SUBCH_ACTIVE)) {\n- ret = -EBUSY;\n- goto out;\n+ sch->iret.cc = 2;\n+ return;\n }\n \n if (s->ctrl & SCSW_CTRL_MASK_STCTL) {\n- ret = -EINPROGRESS;\n- goto out;\n+ sch->iret.cc = 1;\n+ return;\n }\n \n /* Cancel the current operation. */\n@@ -1271,10 +1270,6 @@ int css_do_xsch(SubchDev *sch)\n sch->last_cmd_valid = false;\n s->dstat = 0;\n s->cstat = 0;\n- ret = 0;\n-\n-out:\n- return ret;\n }\n \n int css_do_csch(SubchDev *sch)\ndiff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h\nindex d093181a9e..d78ee5714b 100644\n--- a/include/hw/s390x/css.h\n+++ b/include/hw/s390x/css.h\n@@ -204,7 +204,7 @@ void css_conditional_io_interrupt(SubchDev *sch);\n int css_do_stsch(SubchDev *sch, SCHIB *schib);\n bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid);\n int css_do_msch(SubchDev *sch, const SCHIB *schib);\n-int css_do_xsch(SubchDev *sch);\n+void css_do_xsch(SubchDev *sch);\n int css_do_csch(SubchDev *sch);\n int css_do_hsch(SubchDev *sch);\n void css_do_ssch(SubchDev *sch, ORB *orb);\ndiff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c\nindex e8044068c2..f8e038fac7 100644\n--- a/target/s390x/ioinst.c\n+++ b/target/s390x/ioinst.c\n@@ -41,8 +41,6 @@ void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)\n {\n int cssid, ssid, schid, m;\n SubchDev *sch;\n- int ret = -ENODEV;\n- int cc;\n \n if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {\n program_interrupt(&cpu->env, PGM_OPERAND, 4);\n@@ -50,24 +48,17 @@ void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)\n }\n trace_ioinst_sch_id(\"xsch\", cssid, ssid, schid);\n sch = css_find_subch(m, cssid, ssid, schid);\n- if (sch && css_subch_visible(sch)) {\n- ret = css_do_xsch(sch);\n+ if (!sch || !css_subch_visible(sch)) {\n+ setcc(cpu, 3);\n+ return;\n }\n- switch (ret) {\n- case -ENODEV:\n- cc = 3;\n- break;\n- case -EBUSY:\n- cc = 2;\n- break;\n- case 0:\n- cc = 0;\n- break;\n- default:\n- cc = 1;\n- break;\n+ css_subch_clear_iret(sch);\n+ css_do_xsch(sch);\n+ if (sch->iret.pgm_chk) {\n+ program_interrupt(&cpu->env, sch->iret.irq_code, 4);\n+ return;\n }\n- setcc(cpu, cc);\n+ setcc(cpu, sch->iret.cc);\n }\n \n void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)\n", "prefixes": [ "5/9" ] }