{"id":807765,"url":"http://patchwork.ozlabs.org/api/patches/807765/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-41-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-41-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:48","name":"[PULL,40/44] target/s390x: cleanup cpu.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ffa7d47a9ffa60c4b3e383dcf3e659ebea1d4494","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-41-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/807765/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807765/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xjByf3zcRz9s8P\n\tfor ;\n\tThu, 31 Aug 2017 03:17:30 +1000 (AEST)","from localhost ([::1]:51725 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6cK-0006bx-7N\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:17:28 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57870)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6HZ-0004Lv-SH\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:56:06 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6HW-0006At-8Y\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:56:01 -0400","from mx1.redhat.com ([209.132.183.28]:42678)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6HV-0006AX-VW\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:58 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 D9C82155E0;\n\tWed, 30 Aug 2017 16:55:56 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 382C887FA8;\n\tWed, 30 Aug 2017 16:55:56 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D9C82155E0","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:48 +0200","Message-Id":"<20170830165252.13421-41-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tWed, 30 Aug 2017 16:55:57 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","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 40/44] target/s390x: cleanup cpu.h","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":"From: David Hildenbrand \n\nLet's reshuffle the function prototypes so we get a cleaner outline\nof the files.\n\nReviewed-by: Richard Henderson \nReviewed-by: Philippe Mathieu-Daudé \nSigned-off-by: David Hildenbrand \nMessage-Id: <20170818114353.13455-19-david@redhat.com>\nSigned-off-by: Cornelia Huck \n---\n target/s390x/cpu.h | 137 ++++++++++++++++++++++++++---------------------------\n 1 file changed, 68 insertions(+), 69 deletions(-)","diff":"diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 464db3e556..4ec338077e 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -390,46 +390,6 @@ static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,\n #define PER_CODE_EVENT_STORE_REAL 0x0800\n #define PER_CODE_EVENT_NULLIFICATION 0x0100\n \n-S390CPU *cpu_s390x_init(const char *cpu_model);\n-S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp);\n-\n-/* you can call this signal handler from your SIGBUS and SIGSEGV\n- signal handlers to inform the virtual CPU of exceptions. non zero\n- is returned if the signal was handled by the virtual CPU. */\n-int cpu_s390x_signal_handler(int host_signum, void *pinfo,\n- void *puc);\n-\n-\n-#ifndef CONFIG_USER_ONLY\n-\n-void s390_enable_css_support(S390CPU *cpu);\n-int s390_virtio_hypercall(CPUS390XState *env);\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-S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n-unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu);\n-\n-/* service interrupts are floating therefore we must not pass an cpustate */\n-void s390_sclp_extint(uint32_t parm);\n-\n-#else\n-static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu)\n-{\n- return 0;\n-}\n-#endif\n-\n-extern void subsystem_reset(void);\n-\n-#define cpu_init(model) CPU(cpu_s390x_init(model))\n-#define cpu_signal_handler cpu_s390x_signal_handler\n-\n-void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf);\n-#define cpu_list s390_cpu_list\n-const char *s390_default_cpu_model_name(void);\n-\n #define EXCP_EXT 1 /* external interrupt */\n #define EXCP_SVC 2 /* supervisor call (syscall) */\n #define EXCP_PGM 3 /* program interruption */\n@@ -649,39 +609,10 @@ struct sysib_322 {\n /* SIGP order code mask corresponding to bit positions 56-63 */\n #define SIGP_ORDER_MASK 0x000000ff\n \n-int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);\n-\n-int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,\n- int len, bool is_write);\n-\n-#define s390_cpu_virt_mem_read(cpu, laddr, ar, dest, len) \\\n- s390_cpu_virt_mem_rw(cpu, laddr, ar, dest, len, false)\n-#define s390_cpu_virt_mem_write(cpu, laddr, ar, dest, len) \\\n- s390_cpu_virt_mem_rw(cpu, laddr, ar, dest, len, true)\n-#define s390_cpu_virt_mem_check_write(cpu, laddr, ar, len) \\\n- s390_cpu_virt_mem_rw(cpu, laddr, ar, NULL, len, true)\n-\n /* from s390-virtio-ccw */\n #define MEM_SECTION_SIZE 0x10000000UL\n #define MAX_AVAIL_SLOTS 32\n \n-/* automatically detect the instruction length */\n-#define ILEN_AUTO 0xff\n-void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);\n-\n-\n-int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);\n-void s390_cmma_reset(void);\n-int s390_cpu_restart(S390CPU *cpu);\n-int s390_get_memslot_count(void);\n-void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,\n- uint32_t io_int_parm, uint32_t io_int_word);\n-void s390_crw_mchk(void);\n-int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,\n- int vq, bool assign);\n-void s390_crypto_reset(void);\n-bool s390_get_squash_mcss(void);\n-\n /* machine check interruption code */\n \n /* subclasses */\n@@ -727,4 +658,72 @@ bool s390_get_squash_mcss(void);\n #define MCIC_VB_CT 0x0000000000020000ULL\n #define MCIC_VB_CC 0x0000000000010000ULL\n \n+\n+/* cpu.c */\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+void s390_crypto_reset(void);\n+bool s390_get_squash_mcss(void);\n+int s390_get_memslot_count(void);\n+int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);\n+void s390_cmma_reset(void);\n+int s390_cpu_restart(S390CPU *cpu);\n+void s390_enable_css_support(S390CPU *cpu);\n+int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,\n+ int vq, bool assign);\n+#ifndef CONFIG_USER_ONLY\n+unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu);\n+#else\n+static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu)\n+{\n+ return 0;\n+}\n+#endif /* CONFIG_USER_ONLY */\n+\n+\n+/* cpu_models.c */\n+void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf);\n+#define cpu_list s390_cpu_list\n+const char *s390_default_cpu_model_name(void);\n+\n+\n+/* helper.c */\n+S390CPU *cpu_s390x_init(const char *cpu_model);\n+#define cpu_init(model) CPU(cpu_s390x_init(model))\n+S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp);\n+/* you can call this signal handler from your SIGBUS and SIGSEGV\n+ signal handlers to inform the virtual CPU of exceptions. non zero\n+ is returned if the signal was handled by the virtual CPU. */\n+int cpu_s390x_signal_handler(int host_signum, void *pinfo, void *puc);\n+#define cpu_signal_handler cpu_s390x_signal_handler\n+\n+\n+/* interrupt.c */\n+void s390_crw_mchk(void);\n+void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,\n+ uint32_t io_int_parm, uint32_t io_int_word);\n+/* automatically detect the instruction length */\n+#define ILEN_AUTO 0xff\n+void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);\n+/* service interrupts are floating therefore we must not pass an cpustate */\n+void s390_sclp_extint(uint32_t parm);\n+\n+\n+/* mmu_helper.c */\n+int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,\n+ int len, bool is_write);\n+#define s390_cpu_virt_mem_read(cpu, laddr, ar, dest, len) \\\n+ s390_cpu_virt_mem_rw(cpu, laddr, ar, dest, len, false)\n+#define s390_cpu_virt_mem_write(cpu, laddr, ar, dest, len) \\\n+ s390_cpu_virt_mem_rw(cpu, laddr, ar, dest, len, true)\n+#define s390_cpu_virt_mem_check_write(cpu, laddr, ar, len) \\\n+ s390_cpu_virt_mem_rw(cpu, laddr, ar, NULL, len, true)\n+\n+\n+/* outside of target/s390x/ */\n+S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n+extern void subsystem_reset(void);\n+int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);\n+int s390_virtio_hypercall(CPUS390XState *env);\n+\n #endif\n","prefixes":["PULL","40/44"]}