Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 556cc0da authored by Jens Freimann's avatar Jens Freimann Committed by Christian Borntraeger
Browse files

KVM: s390: trace correct values for set prefix and machine checks 



When injecting SIGP set prefix or a machine check, we trace
the values in our per-vcpu local_int data structure instead
of the parameters passed to the function.

Fix this by changing the trace statement to use the correct values.

Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 49538d12

arch/s390/kvm/interrupt.c

+4 −4
Original line number Diff line number Diff line
@@ -1049,9 +1049,9 @@ static int __inject_set_prefix(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) 
	struct kvm_s390_prefix_info *prefix = &li->irq.prefix;



	VCPU_EVENT(vcpu, 3, "inject: set prefix to %x (from user)",

		   prefix->address);

		   irq->u.prefix.address);

	trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_SIGP_SET_PREFIX,

				   prefix->address, 0, 2);

				   irq->u.prefix.address, 0, 2);



	if (!is_vcpu_stopped(vcpu))

		return -EBUSY;
@@ -1121,9 +1121,9 @@ static int __inject_mchk(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) 
	struct kvm_s390_mchk_info *mchk = &li->irq.mchk;



	VCPU_EVENT(vcpu, 5, "inject: machine check parm64:%llx",

		   mchk->mcic);

		   irq->u.mchk.mcic);

	trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_MCHK, 0,

				   mchk->mcic, 2);

				   irq->u.mchk.mcic, 2);



	/*

	 * Because repressible machine checks can be indicated along with