diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-11-16 16:17:45 +0100 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2016-02-10 13:12:51 +0100 |
| commit | 659773227506f7b971cfd52e1aa146c896405187 (patch) | |
| tree | 45f1f303110f7a783597eaf29c5a35460ed7410c /arch/s390 | |
| parent | 34346b9a9388b28c3b4a865f8b4f98863f05df81 (diff) | |
| download | blackbird-obmc-linux-659773227506f7b971cfd52e1aa146c896405187.tar.gz blackbird-obmc-linux-659773227506f7b971cfd52e1aa146c896405187.zip | |
KVM: s390: read the correct opcode on SIE faults
Let's use our fresh new function read_guest_instr() to access
guest storage via the correct addressing schema.
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 85e169b8e90d..aa51a8d5179f 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2163,7 +2163,6 @@ static int vcpu_pre_run(struct kvm_vcpu *vcpu) static int vcpu_post_run_fault_in_sie(struct kvm_vcpu *vcpu) { - psw_t *psw = &vcpu->arch.sie_block->gpsw; u8 opcode; int rc; @@ -2178,7 +2177,7 @@ static int vcpu_post_run_fault_in_sie(struct kvm_vcpu *vcpu) * to look up the current opcode to get the length of the instruction * to be able to forward the PSW. */ - rc = read_guest(vcpu, psw->addr, 0, &opcode, 1); + rc = read_guest_instr(vcpu, &opcode, 1); if (rc) return kvm_s390_inject_prog_cond(vcpu, rc); kvm_s390_forward_psw(vcpu, insn_length(opcode)); |
