On 11.08.2017 09:46, David Hildenbrand wrote:
> Signed-off-by: David Hildenbrand <da...@redhat.com>
> ---
> target/s390x/cpu.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++
> target/s390x/cpu.h | 88
> +++++++-----------------------------------------------
> 2 files changed, 90 insertions(+), 78 deletions(-)
>
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index dadd383..81165e8 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -392,6 +392,86 @@ unsigned int s390_cpu_set_state(uint8_t cpu_state,
> S390CPU *cpu)
[...]
> +int s390_assign_subch_ioeventfd(EventNotifier *notifier,
> + uint32_t sch_id, int vq,
> + bool assign)
Indentation looks weird.
[....]
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 1ab88ad..a9acef6 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -421,25 +421,8 @@ static inline int kvm_s390_set_clock(uint8_t *tod_high,
> uint64_t *tod_low)
[...]
> +int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);
> +void s390_cmma_reset(void);
> +int s390_cpu_restart(S390CPU *cpu);
> +int s390_get_memslot_count(KVMState *s);
> void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,
> uint32_t io_int_parm, uint32_t io_int_word);
> void s390_crw_mchk(void);
> -
> -static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier,
> +int s390_assign_subch_ioeventfd(EventNotifier *notifier,
> uint32_t sch_id, int vq,
> - bool assign)
... and that's likely the reason ;-) Indentation now looks wrong here, too.
> -{
> - if (kvm_enabled()) {
> - return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
> - } else {
> - return 0;
> - }
> -}
> -
> -static inline void s390_crypto_reset(void)
> -{
> - if (kvm_enabled()) {
> - kvm_s390_crypto_reset();
> - }
> -}
> -
> -static inline bool s390_get_squash_mcss(void)
> -{
> - if (object_property_get_bool(OBJECT(qdev_get_machine()),
> "s390-squash-mcss",
> - NULL)) {
> - return true;
> - }
> -
> - return false;
> -}
> + bool assign);
> +void s390_crypto_reset(void);
> +bool s390_get_squash_mcss(void);
>
> /* machine check interruption code */
>
>
Apart from the white space nits, looks fine, so when you've fixed them:
Reviewed-by: Thomas Huth <th...@redhat.com>
