lkml.org 
[lkml]   [2014]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 051/104] KVM: s390: fix diagnose code extraction
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Heiko Carstens <heiko.carstens@de.ibm.com>

    commit 743db27c526e0f31cc507959d662e97e2048a86f upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/s390/kvm/diag.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/s390/kvm/diag.c
    +++ b/arch/s390/kvm/diag.c
    @@ -130,7 +130,7 @@ static int __diag_virtio_hypercall(struc

    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;

    trace_kvm_s390_handle_diag(vcpu, code);
    switch (code) {



    \
     
     \ /
      Last update: 2014-02-05 00:21    [W:4.205 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site