diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-11-28 15:30:16 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-11-28 15:30:16 +0100 |
| commit | d6d63b51fe3bfea0cf596993afa480b0b3b02c32 (patch) | |
| tree | ebe038c7ba4a00b6367c3eade0f218f2b518c4ef /arch/s390/kvm/diag.c | |
| parent | 0a00a775d2a49d16efba721c786859844184599c (diff) | |
| parent | 36daca9bb36f0395755817d1b0c45ab6fbf0441b (diff) | |
Merge tag 'kvm-s390-20131128' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next
Several fixes for kvm-next.
The diagnose decoding and the missing store status are more major (can
cause the host to execute different things than the guest wanted resp.
produce unusable dumps when something breaks). The other patches contain
more minor fixes and cleanups.
Diffstat (limited to 'arch/s390/kvm/diag.c')
| -rw-r--r-- | arch/s390/kvm/diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index 78d967f180f..5ff29be7d87 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c @@ -137,7 +137,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu) int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) { - int code = (vcpu->arch.sie_block->ipb & 0xfff0000) >> 16; + int code = kvm_s390_get_base_disp_rs(vcpu) & 0xffff; if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); |