cpu.h is accessed outside of target/s390x. It should only contain what is expected to be accessed outside of this folder. Therefore, create internal.h and move a lot to that file. In addition, introduce kvm-stub.c and kvm_390x.h for kvm specific functions.
Let's see what compilers think about this version. RFC -> v1: - (hopefully) fixed a compile error - move some functions from cpu.h to the only c file they are used in - move kvm function and stubs to kvm_s390x.h and kvm-stub.c - smaller requested style fixes David Hildenbrand (10): target/s390x: move cc_name() to cc_helper.c target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c target/s390x: move psw_key_valid() to mem_helper.c target/s390x: move s390_do_cpu_reset() to diag.c target/s390x: move get_per_in_range() to misc_helper.c target/s390x: introduce internal.h target/s390x: move a couple of functions to cpu.c s390x: avoid calling kvm_ functions outside of target/s390x/ s390x/kvm: move KVM declarations and stubs to separate files target/s390x: cleanup cpu.h hw/s390x/s390-virtio-ccw.c | 4 +- target/s390x/Makefile.objs | 1 + target/s390x/arch_dump.c | 1 + target/s390x/cc_helper.c | 49 +++ target/s390x/cpu.c | 87 ++++++ target/s390x/cpu.h | 761 +++++---------------------------------------- target/s390x/cpu_models.c | 1 + target/s390x/diag.c | 8 + target/s390x/excp_helper.c | 15 + target/s390x/fpu_helper.c | 1 + target/s390x/gdbstub.c | 1 + target/s390x/helper.c | 1 + target/s390x/int_helper.c | 1 + target/s390x/internal.h | 391 +++++++++++++++++++++++ target/s390x/interrupt.c | 1 + target/s390x/ioinst.c | 1 + target/s390x/kvm-stub.c | 111 +++++++ target/s390x/kvm.c | 1 + target/s390x/kvm_s390x.h | 51 +++ target/s390x/machine.c | 1 + target/s390x/mem_helper.c | 12 + target/s390x/misc_helper.c | 12 + target/s390x/mmu_helper.c | 1 + target/s390x/translate.c | 1 + 24 files changed, 820 insertions(+), 694 deletions(-) create mode 100644 target/s390x/internal.h create mode 100644 target/s390x/kvm-stub.c create mode 100644 target/s390x/kvm_s390x.h -- 2.9.4
