{"id":807759,"url":"http://patchwork.ozlabs.org/api/patches/807759/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-17-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-17-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:24","name":"[PULL,16/44] s390x: chsc nt2 events are pci-only","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8e45d8cfcab2121bedc752390af47c5630a47120","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-17-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807759/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807759/checks/","tags":{},"related":[],"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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@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 3xjBv273Y6z9s8P\n\tfor ;\n\tThu, 31 Aug 2017 03:14:22 +1000 (AEST)","from localhost ([::1]:51708 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6ZI-0003Pz-Bv\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:14:20 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56929)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Fi-00026K-90\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:07 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Fh-0005K1-Bq\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:06 -0400","from mx1.redhat.com ([209.132.183.28]:57260)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Fh-0005Jo-2W\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:05 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 EC5CD81DE2;\n\tWed, 30 Aug 2017 16:54:03 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 21E809785C;\n\tWed, 30 Aug 2017 16:54:00 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com EC5CD81DE2","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:24 +0200","Message-Id":"<20170830165252.13421-17-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 30 Aug 2017 16:54:04 +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] [PULL 16/44] s390x: chsc nt2 events are pci-only","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":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"The nt2 event class is pci-only - don't look for events if pci is\nnot in the active cpu model.\n\nReviewed-by: Thomas Huth \nAcked-by: Christian Borntraeger \nSigned-off-by: Cornelia Huck \n---\n hw/s390x/s390-pci-bus.c | 4 ++--\n hw/s390x/s390-pci-bus.h | 4 ++--\n hw/s390x/s390-pci-stub.c | 4 ++--\n target/s390x/ioinst.c | 16 ++++++++++++++++\n 4 files changed, 22 insertions(+), 6 deletions(-)","diff":"diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c\nindex 61cfd2138f..c57f6ebae0 100644\n--- a/hw/s390x/s390-pci-bus.c\n+++ b/hw/s390x/s390-pci-bus.c\n@@ -47,7 +47,7 @@ S390pciState *s390_get_phb(void)\n return phb;\n }\n \n-int chsc_sei_nt2_get_event(void *res)\n+int pci_chsc_sei_nt2_get_event(void *res)\n {\n ChscSeiNt2Res *nt2_res = (ChscSeiNt2Res *)res;\n PciCcdfAvail *accdf;\n@@ -87,7 +87,7 @@ int chsc_sei_nt2_get_event(void *res)\n return rc;\n }\n \n-int chsc_sei_nt2_have_event(void)\n+int pci_chsc_sei_nt2_have_event(void)\n {\n S390pciState *s = s390_get_phb();\n \ndiff --git a/hw/s390x/s390-pci-bus.h b/hw/s390x/s390-pci-bus.h\nindex 67af2c12ff..5df6292509 100644\n--- a/hw/s390x/s390-pci-bus.h\n+++ b/hw/s390x/s390-pci-bus.h\n@@ -319,8 +319,8 @@ typedef struct S390pciState {\n } S390pciState;\n \n S390pciState *s390_get_phb(void);\n-int chsc_sei_nt2_get_event(void *res);\n-int chsc_sei_nt2_have_event(void);\n+int pci_chsc_sei_nt2_get_event(void *res);\n+int pci_chsc_sei_nt2_have_event(void);\n void s390_pci_sclp_configure(SCCB *sccb);\n void s390_pci_sclp_deconfigure(SCCB *sccb);\n void s390_pci_iommu_enable(S390PCIIOMMU *iommu);\ndiff --git a/hw/s390x/s390-pci-stub.c b/hw/s390x/s390-pci-stub.c\nindex 48f8b4e8a3..7a642d376c 100644\n--- a/hw/s390x/s390-pci-stub.c\n+++ b/hw/s390x/s390-pci-stub.c\n@@ -7,12 +7,12 @@\n #include \"s390-pci-bus.h\"\n \n /* target/s390x/ioinst.c */\n-int chsc_sei_nt2_get_event(void *res)\n+int pci_chsc_sei_nt2_get_event(void *res)\n {\n return 1;\n }\n \n-int chsc_sei_nt2_have_event(void)\n+int pci_chsc_sei_nt2_have_event(void)\n {\n return 0;\n }\ndiff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c\nindex 51fbea620d..3fa3301f50 100644\n--- a/target/s390x/ioinst.c\n+++ b/target/s390x/ioinst.c\n@@ -599,6 +599,22 @@ static int chsc_sei_nt0_have_event(void)\n return 0;\n }\n \n+static int chsc_sei_nt2_get_event(void *res)\n+{\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ return pci_chsc_sei_nt2_get_event(res);\n+ }\n+ return 1;\n+}\n+\n+static int chsc_sei_nt2_have_event(void)\n+{\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ return pci_chsc_sei_nt2_have_event();\n+ }\n+ return 0;\n+}\n+\n #define CHSC_SEI_NT0 (1ULL << 63)\n #define CHSC_SEI_NT2 (1ULL << 61)\n static void ioinst_handle_chsc_sei(ChscReq *req, ChscResp *res)\n","prefixes":["PULL","16/44"]}