diff options
| author | Paolo Bonzini | 2014-01-20 13:00:02 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2014-01-20 13:00:02 +0100 |
| commit | 7650b6870930055426abb32cc47d164ccdea49db (patch) | |
| tree | c473ed922f8ae99ed2615570b503c9188b452063 /arch | |
| parent | kvm: make KVM_MMU_AUDIT help text more readable (diff) | |
| parent | KVM: s390: Fix memory access error detection (diff) | |
| download | kernel-qcow2-linux-7650b6870930055426abb32cc47d164ccdea49db.tar.gz kernel-qcow2-linux-7650b6870930055426abb32cc47d164ccdea49db.tar.xz kernel-qcow2-linux-7650b6870930055426abb32cc47d164ccdea49db.zip | |
Merge branch 'kvm-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-queue
A fix for a regression that is in current kvm/next, which is
targetted for 3.14.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 1bb1ddaf93c0..7635c00a1479 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -738,6 +738,10 @@ static int vcpu_post_run(struct kvm_vcpu *vcpu, int exit_reason) current->thread.gmap_addr; vcpu->run->s390_ucontrol.pgm_code = 0x10; rc = -EREMOTE; + } else { + VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction"); + trace_kvm_s390_sie_fault(vcpu); + rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); } memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16); |