Re: [PATCH v1 2/4] KVM: s390: use WARN_ON_ONCE only for checking

[Cornelia Huck <cohuck@redhat.com>]

On Wed, 30 Aug 2017 18:06:01 +0200
David Hildenbrand <david@redhat.com> wrote:

> Move the real logic that always has to be executed out of the
> WARN_ON_ONCE.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  arch/s390/kvm/interrupt.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
> index a619ddae610d..a832ad031cee 100644
> --- a/arch/s390/kvm/interrupt.c
> +++ b/arch/s390/kvm/interrupt.c
> @@ -2479,6 +2479,7 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu,
>  	struct kvm_s390_mchk_info *mchk;
>  	union mci mci;
>  	__u64 cr14 = 0;         /* upper bits are not used */
> +	int rc;
>  
>  	mci.val = mcck_info->mcic;
>  	if (mci.sr)
> @@ -2496,12 +2497,13 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu,
>  	if (mci.ck) {
>  		/* Inject the floating machine check */
>  		inti.type = KVM_S390_MCHK;
> -		WARN_ON_ONCE(__inject_vm(vcpu->kvm, &inti));
> +		rc = __inject_vm(vcpu->kvm, &inti);
>  	} else {
>  		/* Inject the machine check to specified vcpu */
>  		irq.type = KVM_S390_MCHK;
> -		WARN_ON_ONCE(kvm_s390_inject_vcpu(vcpu, &irq));
> +		rc = kvm_s390_inject_vcpu(vcpu, &irq);
>  	}
> +	WARN_ON_ONCE(rc);
>  }
>  
>  int kvm_set_routing_entry(struct kvm *kvm,

Reviewed-by: Cornelia Huck <cohuck@redhat.com>