On 11.08.2017 09:46, David Hildenbrand wrote: > cpu.h should only contain what really has to be accessed outside of > target/s390x/. Add internal.h which can only be used inside target/s390x/. > > Move everything that isn't fast enough to run away and restructure it > right away. > > Minor style fixes to avoid checkpatch warning to: > - struct Lowcore: "{" goes into same line as typedef > - struct LowCore: add spaces around "-" in array length calculations > - time2tod() and tod2time(): move "{" to separate line > - get_per_atmid(): add space between ")" and "?". Move cases by one char. > - get_per_atmid(): drop extra paremthesis around (1 << 6) > > Signed-off-by: David Hildenbrand <da...@redhat.com> > --- [...] > +/* kvm.c */ > +#ifdef CONFIG_KVM > +void kvm_s390_floating_interrupt(struct kvm_s390_irq *irq); > +void kvm_s390_service_interrupt(uint32_t parm); > +void kvm_s390_vcpu_interrupt(S390CPU *cpu, struct kvm_s390_irq *irq); > +void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t > te_code); > +int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf, > + int len, bool is_write); > +void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code); > +void kvm_s390_io_interrupt(uint16_t subchannel_id, > + uint16_t subchannel_nr, uint32_t io_int_parm, > + uint32_t io_int_word); > +void kvm_s390_crw_mchk(void); > +int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state); > +void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu); > +int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu); > +int kvm_s390_get_ri(void); > +int kvm_s390_get_gs(void); > +#else > +static inline void kvm_s390_service_interrupt(uint32_t parm) > +{ > +} > +static inline void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, > + uint64_t te_code) > +{ > +} > +static inline int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, > + void *hostbuf, int len, bool is_write) > +{ > + return -ENOSYS; > +} > +static inline void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code) > +{ > +} > +static inline void kvm_s390_io_interrupt(uint16_t subchannel_id, > + uint16_t subchannel_nr, > + uint32_t io_int_parm, > + uint32_t io_int_word) > +{ > +} > +static inline void kvm_s390_crw_mchk(void) > +{ > +} > +static inline int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state) > +{ > + return -ENOSYS; > +} > +static inline void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu) > +{ > +} > +static inline int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu) > +{ > + return 0; > +} > +static inline int kvm_s390_get_ri(void) > +{ > + return 0; > +} > +static inline int kvm_s390_get_gs(void) > +{ > + return 0; > +} > +#endif /* CONFIG_KVM */
By the way, all the other targets that have KVM have a separate header for things like this: kvm_arm.h, kvm_ppc.h, kvm_mips.h, kvm_i386.h ... maybe it's time for kvm_s390x.h now? Thomas