diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-11-11 13:56:47 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2013-11-28 11:08:15 +0100 |
| commit | 743db27c526e0f31cc507959d662e97e2048a86f (patch) | |
| tree | 0d384e3ad7fd1f3a83ad4915a44c95a299d26afb /arch/s390 | |
| parent | KVM: s390: Fix clock comparator field for STORE STATUS (diff) | |
| download | linux-743db27c526e0f31cc507959d662e97e2048a86f.tar.xz linux-743db27c526e0f31cc507959d662e97e2048a86f.zip | |
KVM: s390: fix diagnose code extraction
The diagnose code to be used is the contents of the base register (if not
zero), plus the displacement. The current code ignores the base register
contents. So let's fix that...
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -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 78d967f180f4..5ff29be7d87a 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); |