Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807770/?format=api
{ "id": 807770, "url": "http://patchwork.ozlabs.org/api/patches/807770/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-40-cohuck@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": "<20170830165252.13421-40-cohuck@redhat.com>", "list_archive_url": null, "date": "2017-08-30T16:52:47", "name": "[PULL,39/44] s390x/kvm: move KVM declarations and stubs to separate files", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7f1f68f933d12526c0055d7cb2eb86ee8db338ff", "submitter": { "id": 71914, "url": "http://patchwork.ozlabs.org/api/people/71914/?format=api", "name": "Cornelia Huck", "email": "cohuck@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-40-cohuck@redhat.com/mbox/", "series": [ { "id": 656, "url": "http://patchwork.ozlabs.org/api/series/656/?format=api", "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/807770/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807770/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-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 3xjC4p02Rrz9sN5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 03:22:50 +1000 (AEST)", "from localhost ([::1]:51749 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 1dn6hT-0002Wi-M4\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:22:47 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:57831)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6HV-0004Dq-NJ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:56:01 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6HT-0006A6-LQ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:57 -0400", "from mx1.redhat.com ([209.132.183.28]:32796)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <cohuck@redhat.com>) id 1dn6HT-00069V-Bn\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:55 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 462B381DF0;\n\tWed, 30 Aug 2017 16:55:54 +0000 (UTC)", "from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 7EF9960BF2;\n\tWed, 30 Aug 2017 16:55:51 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 462B381DF0", "From": "Cornelia Huck <cohuck@redhat.com>", "To": "peter.maydell@linaro.org", "Date": "Wed, 30 Aug 2017 18:52:47 +0200", "Message-Id": "<20170830165252.13421-40-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.13", "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:55:54 +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 39/44] s390x/kvm: move KVM declarations and\n\tstubs to separate files", "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, david@redhat.com, Cornelia Huck <cohuck@redhat.com>,\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<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: David Hildenbrand <david@redhat.com>\n\nLet's do it just like the other architectures. Introduce kvm-stub.c\nfor stubs and kvm_s390x.h for the declarations.\n\nChange license to GPL2+ and keep copyright notice.\n\nAs we are dropping the sysemu/kvm.h include from cpu.h, fix up includes.\n\nSuggested-by: Thomas Huth <thuth@redhat.com>\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nSigned-off-by: David Hildenbrand <david@redhat.com>\nMessage-Id: <20170818114353.13455-18-david@redhat.com>\nSigned-off-by: Cornelia Huck <cohuck@redhat.com>\n---\n hw/intc/s390_flic_kvm.c | 1 +\n hw/s390x/s390-stattrib-kvm.c | 1 +\n include/hw/s390x/css.h | 1 +\n target/s390x/Makefile.objs | 1 +\n target/s390x/cpu.c | 2 +\n target/s390x/cpu.h | 119 -------------------------------------------\n target/s390x/cpu_models.c | 2 +\n target/s390x/interrupt.c | 1 +\n target/s390x/kvm-stub.c | 111 ++++++++++++++++++++++++++++++++++++++++\n target/s390x/kvm.c | 1 +\n target/s390x/kvm_s390x.h | 47 +++++++++++++++++\n target/s390x/machine.c | 1 +\n target/s390x/mmu_helper.c | 1 +\n 13 files changed, 170 insertions(+), 119 deletions(-)\n create mode 100644 target/s390x/kvm-stub.c\n create mode 100644 target/s390x/kvm_s390x.h", "diff": "diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c\nindex be3fd00a57..7ead17ac3e 100644\n--- a/hw/intc/s390_flic_kvm.c\n+++ b/hw/intc/s390_flic_kvm.c\n@@ -13,6 +13,7 @@\n #include \"qemu/osdep.h\"\n #include \"qemu-common.h\"\n #include \"cpu.h\"\n+#include \"kvm_s390x.h\"\n #include <sys/ioctl.h>\n #include \"qemu/error-report.h\"\n #include \"qapi/error.h\"\ndiff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c\nindex ff3f89fd2d..ed95d13c68 100644\n--- a/hw/s390x/s390-stattrib-kvm.c\n+++ b/hw/s390x/s390-stattrib-kvm.c\n@@ -17,6 +17,7 @@\n #include \"sysemu/kvm.h\"\n #include \"exec/ram_addr.h\"\n #include \"cpu.h\"\n+#include \"kvm_s390x.h\"\n \n Object *kvm_s390_stattrib_create(void)\n {\ndiff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h\nindex 5b017e1fc3..0653d3c9be 100644\n--- a/include/hw/s390x/css.h\n+++ b/include/hw/s390x/css.h\n@@ -16,6 +16,7 @@\n #include \"hw/s390x/adapter.h\"\n #include \"hw/s390x/s390_flic.h\"\n #include \"hw/s390x/ioinst.h\"\n+#include \"sysemu/kvm.h\"\n \n /* Channel subsystem constants. */\n #define MAX_DEVNO 65535\ndiff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs\nindex f42cd1f9cc..9615256d81 100644\n--- a/target/s390x/Makefile.objs\n+++ b/target/s390x/Makefile.objs\n@@ -3,6 +3,7 @@ obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o\n obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o\n obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o\n obj-$(CONFIG_KVM) += kvm.o\n+obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o\n \n # build and run feature list generator\n feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/\ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex c538a95850..7267b60d41 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -27,6 +27,8 @@\n #include \"qapi/error.h\"\n #include \"cpu.h\"\n #include \"internal.h\"\n+#include \"kvm_s390x.h\"\n+#include \"sysemu/kvm.h\"\n #include \"qemu-common.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/timer.h\"\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 77b29774cc..464db3e556 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -213,8 +213,6 @@ static inline S390CPU *s390_env_get_cpu(CPUS390XState *env)\n extern const struct VMStateDescription vmstate_s390_cpu;\n #endif\n \n-#include \"sysemu/kvm.h\"\n-\n /* distinguish between 24 bit and 31 bit addressing */\n #define HIGH_ORDER_BIT 0x80000000\n \n@@ -407,39 +405,6 @@ int cpu_s390x_signal_handler(int host_signum, void *pinfo,\n void s390_enable_css_support(S390CPU *cpu);\n int s390_virtio_hypercall(CPUS390XState *env);\n \n-#ifdef CONFIG_KVM\n-void kvm_s390_service_interrupt(uint32_t parm);\n-void kvm_s390_vcpu_interrupt(S390CPU *cpu, struct kvm_s390_irq *irq);\n-void kvm_s390_floating_interrupt(struct kvm_s390_irq *irq);\n-int kvm_s390_inject_flic(struct kvm_s390_irq *irq);\n-void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code);\n-int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf,\n- int len, bool is_write);\n-int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_clock);\n-int kvm_s390_set_clock(uint8_t *tod_high, uint64_t *tod_clock);\n-#else\n-static inline void kvm_s390_service_interrupt(uint32_t parm)\n-{\n-}\n-static inline int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)\n-{\n- return -ENOSYS;\n-}\n-static inline int kvm_s390_set_clock(uint8_t *tod_high, uint64_t *tod_low)\n-{\n- return -ENOSYS;\n-}\n-static inline int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar,\n- void *hostbuf, int len, bool is_write)\n-{\n- return -ENOSYS;\n-}\n-static inline void kvm_s390_access_exception(S390CPU *cpu, uint16_t code,\n- uint64_t te_code)\n-{\n-}\n-#endif\n-\n int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low);\n int s390_set_clock(uint8_t *tod_high, uint64_t *tod_low);\n \n@@ -704,90 +669,6 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,\n #define ILEN_AUTO 0xff\n void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);\n \n-#ifdef CONFIG_KVM\n-void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code);\n-void kvm_s390_io_interrupt(uint16_t subchannel_id,\n- uint16_t subchannel_nr, uint32_t io_int_parm,\n- uint32_t io_int_word);\n-void kvm_s390_crw_mchk(void);\n-void kvm_s390_enable_css_support(S390CPU *cpu);\n-int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,\n- int vq, bool assign);\n-int kvm_s390_cpu_restart(S390CPU *cpu);\n-int kvm_s390_get_memslot_count(void);\n-int kvm_s390_cmma_active(void);\n-void kvm_s390_cmma_reset(void);\n-int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state);\n-void kvm_s390_reset_vcpu(S390CPU *cpu);\n-int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit);\n-void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu);\n-int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu);\n-int kvm_s390_get_ri(void);\n-int kvm_s390_get_gs(void);\n-void kvm_s390_crypto_reset(void);\n-#else\n-static inline void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code)\n-{\n-}\n-static inline void kvm_s390_io_interrupt(uint16_t subchannel_id,\n- uint16_t subchannel_nr,\n- uint32_t io_int_parm,\n- uint32_t io_int_word)\n-{\n-}\n-static inline void kvm_s390_crw_mchk(void)\n-{\n-}\n-static inline void kvm_s390_enable_css_support(S390CPU *cpu)\n-{\n-}\n-static inline int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier,\n- uint32_t sch, int vq,\n- bool assign)\n-{\n- return -ENOSYS;\n-}\n-static inline int kvm_s390_cpu_restart(S390CPU *cpu)\n-{\n- return -ENOSYS;\n-}\n-static inline void kvm_s390_cmma_reset(void)\n-{\n-}\n-static inline int kvm_s390_get_memslot_count(void)\n-{\n- return MAX_AVAIL_SLOTS;\n-}\n-static inline int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)\n-{\n- return -ENOSYS;\n-}\n-static inline void kvm_s390_reset_vcpu(S390CPU *cpu)\n-{\n-}\n-static inline int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)\n-{\n- return 0;\n-}\n-static inline void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu)\n-{\n-}\n-static inline int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)\n-{\n- return 0;\n-}\n-static inline int kvm_s390_get_ri(void)\n-{\n- return 0;\n-}\n-static inline int kvm_s390_get_gs(void)\n-{\n- return 0;\n-}\n-static inline void kvm_s390_crypto_reset(void)\n-{\n-}\n-#endif\n \n int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);\n void s390_cmma_reset(void);\ndiff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\nindex 2ce9157197..18cbf91d9c 100644\n--- a/target/s390x/cpu_models.c\n+++ b/target/s390x/cpu_models.c\n@@ -13,6 +13,8 @@\n #include \"qemu/osdep.h\"\n #include \"cpu.h\"\n #include \"internal.h\"\n+#include \"kvm_s390x.h\"\n+#include \"sysemu/kvm.h\"\n #include \"gen-features.h\"\n #include \"qapi/error.h\"\n #include \"qapi/visitor.h\"\ndiff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c\nindex 119ca74230..058e219fe5 100644\n--- a/target/s390x/interrupt.c\n+++ b/target/s390x/interrupt.c\n@@ -10,6 +10,7 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/log.h\"\n #include \"cpu.h\"\n+#include \"kvm_s390x.h\"\n #include \"internal.h\"\n #include \"exec/exec-all.h\"\n #include \"sysemu/kvm.h\"\ndiff --git a/target/s390x/kvm-stub.c b/target/s390x/kvm-stub.c\nnew file mode 100644\nindex 0000000000..261e1cdc44\n--- /dev/null\n+++ b/target/s390x/kvm-stub.c\n@@ -0,0 +1,111 @@\n+/*\n+ * QEMU KVM support -- s390x specific function stubs.\n+ *\n+ * Copyright (c) 2009 Ulrich Hecht\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#include \"qemu/osdep.h\"\n+#include \"qemu-common.h\"\n+#include \"cpu.h\"\n+#include \"kvm_s390x.h\"\n+\n+void kvm_s390_service_interrupt(uint32_t parm)\n+{\n+}\n+\n+void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code)\n+{\n+}\n+\n+int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf,\n+ int len, bool is_write)\n+{\n+ return -ENOSYS;\n+}\n+\n+void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code)\n+{\n+}\n+\n+void kvm_s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,\n+ uint32_t io_int_parm, uint32_t io_int_word)\n+{\n+}\n+\n+void kvm_s390_crw_mchk(void)\n+{\n+}\n+\n+int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)\n+{\n+ return -ENOSYS;\n+}\n+\n+void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu)\n+{\n+}\n+\n+int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)\n+{\n+ return 0;\n+}\n+\n+int kvm_s390_get_ri(void)\n+{\n+ return 0;\n+}\n+\n+int kvm_s390_get_gs(void)\n+{\n+ return 0;\n+}\n+\n+int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)\n+{\n+ return -ENOSYS;\n+}\n+\n+int kvm_s390_set_clock(uint8_t *tod_high, uint64_t *tod_low)\n+{\n+ return -ENOSYS;\n+}\n+\n+void kvm_s390_enable_css_support(S390CPU *cpu)\n+{\n+}\n+\n+int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,\n+ int vq, bool assign)\n+{\n+ return -ENOSYS;\n+}\n+\n+int kvm_s390_cpu_restart(S390CPU *cpu)\n+{\n+ return -ENOSYS;\n+}\n+\n+void kvm_s390_cmma_reset(void)\n+{\n+}\n+\n+int kvm_s390_get_memslot_count(void)\n+{\n+ return MAX_AVAIL_SLOTS;\n+}\n+\n+void kvm_s390_reset_vcpu(S390CPU *cpu)\n+{\n+}\n+\n+int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)\n+{\n+ return 0;\n+}\n+\n+void kvm_s390_crypto_reset(void)\n+{\n+}\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex e271f958a4..d07763ff2c 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -30,6 +30,7 @@\n #include \"qemu-common.h\"\n #include \"cpu.h\"\n #include \"internal.h\"\n+#include \"kvm_s390x.h\"\n #include \"qemu/error-report.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/sysemu.h\"\ndiff --git a/target/s390x/kvm_s390x.h b/target/s390x/kvm_s390x.h\nnew file mode 100644\nindex 0000000000..2d594bd4ee\n--- /dev/null\n+++ b/target/s390x/kvm_s390x.h\n@@ -0,0 +1,47 @@\n+/*\n+ * QEMU KVM support -- s390x specific functions.\n+ *\n+ * Copyright (c) 2009 Ulrich Hecht\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#ifndef KVM_S390X_H\n+#define KVM_S390X_H\n+\n+struct kvm_s390_irq;\n+\n+void kvm_s390_floating_interrupt(struct kvm_s390_irq *irq);\n+void kvm_s390_service_interrupt(uint32_t parm);\n+void kvm_s390_vcpu_interrupt(S390CPU *cpu, struct kvm_s390_irq *irq);\n+void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code);\n+int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf,\n+ int len, bool is_write);\n+void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code);\n+void kvm_s390_io_interrupt(uint16_t subchannel_id,\n+ uint16_t subchannel_nr, uint32_t io_int_parm,\n+ uint32_t io_int_word);\n+void kvm_s390_crw_mchk(void);\n+int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state);\n+void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu);\n+int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu);\n+int kvm_s390_get_ri(void);\n+int kvm_s390_get_gs(void);\n+int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_clock);\n+int kvm_s390_set_clock(uint8_t *tod_high, uint64_t *tod_clock);\n+void kvm_s390_enable_css_support(S390CPU *cpu);\n+int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,\n+ int vq, bool assign);\n+int kvm_s390_cpu_restart(S390CPU *cpu);\n+int kvm_s390_get_memslot_count(void);\n+int kvm_s390_cmma_active(void);\n+void kvm_s390_cmma_reset(void);\n+void kvm_s390_reset_vcpu(S390CPU *cpu);\n+int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit);\n+void kvm_s390_crypto_reset(void);\n+\n+/* implemented outside of target/s390x/ */\n+int kvm_s390_inject_flic(struct kvm_s390_irq *irq);\n+\n+#endif /* KVM_S390X_H */\ndiff --git a/target/s390x/machine.c b/target/s390x/machine.c\nindex 592db6b515..097a147dbb 100644\n--- a/target/s390x/machine.c\n+++ b/target/s390x/machine.c\n@@ -18,6 +18,7 @@\n #include \"hw/hw.h\"\n #include \"cpu.h\"\n #include \"internal.h\"\n+#include \"kvm_s390x.h\"\n #include \"sysemu/kvm.h\"\n \n static int cpu_post_load(void *opaque, int version_id)\ndiff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c\nindex 09fe5bba29..b528c5921d 100644\n--- a/target/s390x/mmu_helper.c\n+++ b/target/s390x/mmu_helper.c\n@@ -20,6 +20,7 @@\n #include \"exec/address-spaces.h\"\n #include \"cpu.h\"\n #include \"internal.h\"\n+#include \"kvm_s390x.h\"\n #include \"sysemu/kvm.h\"\n #include \"trace.h\"\n #include \"hw/s390x/storage-keys.h\"\n", "prefixes": [ "PULL", "39/44" ] }