lkml.org 
[lkml]   [2009]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/42] KVM: SVM: reorganize svm_interrupt_allowed
    Date
    From: Joerg Roedel <joerg.roedel@amd.com>

    This patch reorganizes the logic in svm_interrupt_allowed to
    make it better to read. This is important because the logic
    is a lot more complicated with Nested SVM.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    ---
    arch/x86/kvm/svm.c | 16 ++++++++++++----
    1 files changed, 12 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index 59fe4d5..3f3fe81 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -2472,10 +2472,18 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu)
    {
    struct vcpu_svm *svm = to_svm(vcpu);
    struct vmcb *vmcb = svm->vmcb;
    - return (vmcb->save.rflags & X86_EFLAGS_IF) &&
    - !(vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) &&
    - gif_set(svm) &&
    - !(is_nested(svm) && (svm->vcpu.arch.hflags & HF_VINTR_MASK));
    + int ret;
    +
    + if (!gif_set(svm) ||
    + (vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK))
    + return 0;
    +
    + ret = !!(vmcb->save.rflags & X86_EFLAGS_IF);
    +
    + if (is_nested(svm))
    + return ret && !(svm->vcpu.arch.hflags & HF_VINTR_MASK);
    +
    + return ret;
    }

    static void enable_irq_window(struct kvm_vcpu *vcpu)
    --
    1.6.5.2


    \
     
     \ /
      Last update: 2009-11-16 13:55    [W:0.020 / U:0.528 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site