{"id":807736,"url":"http://patchwork.ozlabs.org/api/patches/807736/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-16-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-16-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:23","name":"[PULL,15/44] s390x/pci: add stubs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b7ff48d72f82cc39ee9d653aa708def3e51300bb","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-16-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/807736/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807736/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 3xjBdz1kQQz9s7C\n\tfor ;\n\tThu, 31 Aug 2017 03:03:03 +1000 (AEST)","from localhost ([::1]:51665 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6OL-0001wf-1W\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:03:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56893)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Fe-00022x-Mp\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:03 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Fc-0005Hv-Cd\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:02 -0400","from mx1.redhat.com ([209.132.183.28]:56948)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Fc-0005HJ-3A\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:00 -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 0170281DFE;\n\tWed, 30 Aug 2017 16:53:59 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 6A2DB5E24A;\n\tWed, 30 Aug 2017 16:53:58 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0170281DFE","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:23 +0200","Message-Id":"<20170830165252.13421-16-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.14","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:53:59 +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 15/44] s390x/pci: add stubs","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":"Some non-pci code calls into zpci code. Provide some stubs for builds\nwithout pci.\n\nReviewed-by: Thomas Huth \nAcked-by: Christian Borntraeger \nAcked-by: Halil Pasic \nSigned-off-by: Cornelia Huck \n---\n hw/s390x/Makefile.objs | 3 +-\n hw/s390x/s390-pci-stub.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++\n include/hw/s390x/sclp.h | 1 +\n 3 files changed, 79 insertions(+), 1 deletion(-)\n create mode 100644 hw/s390x/s390-pci-stub.c","diff":"diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs\nindex b2aade2466..7ee19d3abc 100644\n--- a/hw/s390x/Makefile.objs\n+++ b/hw/s390x/Makefile.objs\n@@ -11,7 +11,8 @@ obj-y += 3270-ccw.o\n obj-y += virtio-ccw.o\n obj-y += css-bridge.o\n obj-y += ccw-device.o\n-obj-y += s390-pci-bus.o s390-pci-inst.o\n+obj-$(CONFIG_PCI) += s390-pci-bus.o s390-pci-inst.o\n+obj-$(call lnot,$(CONFIG_PCI)) += s390-pci-stub.o\n obj-y += s390-skeys.o\n obj-y += s390-stattrib.o\n obj-$(CONFIG_KVM) += s390-skeys-kvm.o\ndiff --git a/hw/s390x/s390-pci-stub.c b/hw/s390x/s390-pci-stub.c\nnew file mode 100644\nindex 0000000000..48f8b4e8a3\n--- /dev/null\n+++ b/hw/s390x/s390-pci-stub.c\n@@ -0,0 +1,76 @@\n+/* stubs for non-pci builds */\n+\n+#include \"qemu/osdep.h\"\n+#include \"qemu-common.h\"\n+#include \"cpu.h\"\n+#include \"s390-pci-inst.h\"\n+#include \"s390-pci-bus.h\"\n+\n+/* target/s390x/ioinst.c */\n+int chsc_sei_nt2_get_event(void *res)\n+{\n+ return 1;\n+}\n+\n+int chsc_sei_nt2_have_event(void)\n+{\n+ return 0;\n+}\n+\n+/* hw/s390x/sclp.c */\n+void s390_pci_sclp_configure(SCCB *sccb)\n+{\n+ sccb->h.response_code = cpu_to_be16(SCLP_RC_ADAPTER_TYPE_NOT_RECOGNIZED);\n+}\n+\n+void s390_pci_sclp_deconfigure(SCCB *sccb)\n+{\n+ sccb->h.response_code = cpu_to_be16(SCLP_RC_ADAPTER_TYPE_NOT_RECOGNIZED);\n+}\n+\n+/* target/s390x/kvm.c */\n+int clp_service_call(S390CPU *cpu, uint8_t r2)\n+{\n+ return -1;\n+}\n+\n+int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)\n+{\n+ return -1;\n+}\n+\n+int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)\n+{\n+ return -1;\n+}\n+\n+int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)\n+{\n+ return -1;\n+}\n+\n+int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)\n+{\n+ return -1;\n+}\n+\n+int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,\n+ uint8_t ar)\n+{\n+ return -1;\n+}\n+\n+int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)\n+{\n+ return -1;\n+}\n+\n+S390pciState *s390_get_phb(void)\n+{\n+ return NULL;\n+}\n+\n+S390PCIBusDevice *s390_pci_find_dev_by_idx(S390pciState *s, uint32_t idx)\n+{\n+ return NULL;\n+}\ndiff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h\nindex e71d526605..fe54442ecd 100644\n--- a/include/hw/s390x/sclp.h\n+++ b/include/hw/s390x/sclp.h\n@@ -59,6 +59,7 @@\n #define SCLP_RC_INSUFFICIENT_SCCB_LENGTH 0x0300\n #define SCLP_RC_STANDBY_READ_COMPLETION 0x0410\n #define SCLP_RC_ADAPTER_IN_RESERVED_STATE 0x05f0\n+#define SCLP_RC_ADAPTER_TYPE_NOT_RECOGNIZED 0x06f0\n #define SCLP_RC_ADAPTER_ID_NOT_RECOGNIZED 0x09f0\n #define SCLP_RC_INVALID_FUNCTION 0x40f0\n #define SCLP_RC_NO_EVENT_BUFFERS_STORED 0x60f0\n","prefixes":["PULL","15/44"]}