diff options
author | Jens Freimann <jfrei@linux.vnet.ibm.com> | 2014-12-18 09:52:21 -0500 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-01-23 07:25:39 -0500 |
commit | 556cc0dab1f65f40b755da556a462ae68d6b57a1 (patch) | |
tree | 1cf2ed3e53364e118f0fe8145ab03f5e975af8e4 /arch/s390 | |
parent | 49538d12380fa8970f35db1f063189e49e69399c (diff) |
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: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kvm/interrupt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index eb5fb66380e3..a6cb238049d1 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -1049,9 +1049,9 @@ static int __inject_set_prefix(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) | |||
1049 | struct kvm_s390_prefix_info *prefix = &li->irq.prefix; | 1049 | struct kvm_s390_prefix_info *prefix = &li->irq.prefix; |
1050 | 1050 | ||
1051 | VCPU_EVENT(vcpu, 3, "inject: set prefix to %x (from user)", | 1051 | VCPU_EVENT(vcpu, 3, "inject: set prefix to %x (from user)", |
1052 | prefix->address); | 1052 | irq->u.prefix.address); |
1053 | trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_SIGP_SET_PREFIX, | 1053 | trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_SIGP_SET_PREFIX, |
1054 | prefix->address, 0, 2); | 1054 | irq->u.prefix.address, 0, 2); |
1055 | 1055 | ||
1056 | if (!is_vcpu_stopped(vcpu)) | 1056 | if (!is_vcpu_stopped(vcpu)) |
1057 | return -EBUSY; | 1057 | return -EBUSY; |
@@ -1121,9 +1121,9 @@ static int __inject_mchk(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) | |||
1121 | struct kvm_s390_mchk_info *mchk = &li->irq.mchk; | 1121 | struct kvm_s390_mchk_info *mchk = &li->irq.mchk; |
1122 | 1122 | ||
1123 | VCPU_EVENT(vcpu, 5, "inject: machine check parm64:%llx", | 1123 | VCPU_EVENT(vcpu, 5, "inject: machine check parm64:%llx", |
1124 | mchk->mcic); | 1124 | irq->u.mchk.mcic); |
1125 | trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_MCHK, 0, | 1125 | trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_MCHK, 0, |
1126 | mchk->mcic, 2); | 1126 | irq->u.mchk.mcic, 2); |
1127 | 1127 | ||
1128 | /* | 1128 | /* |
1129 | * Because repressible machine checks can be indicated along with | 1129 | * Because repressible machine checks can be indicated along with |