lkml.org 
[lkml]   [2009]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/47] KVM: SVM: simplify nested_svm_check_exception
    Date
    From: Joerg Roedel <joerg.roedel@amd.com>

    Makes the code of this function more readable by removing on
    indentation level for the core logic.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kvm/svm.c | 19 ++++++++-----------
    1 files changed, 8 insertions(+), 11 deletions(-)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index 3bb6d4b..67fad66 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -1359,18 +1359,15 @@ static int nested_svm_check_permissions(struct vcpu_svm *svm)
    static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,
    bool has_error_code, u32 error_code)
    {
    - if (is_nested(svm)) {
    - svm->vmcb->control.exit_code = SVM_EXIT_EXCP_BASE + nr;
    - svm->vmcb->control.exit_code_hi = 0;
    - svm->vmcb->control.exit_info_1 = error_code;
    - svm->vmcb->control.exit_info_2 = svm->vcpu.arch.cr2;
    - if (nested_svm_exit_handled(svm, false)) {
    - nsvm_printk("VMexit -> EXCP 0x%x\n", nr);
    - return 1;
    - }
    - }
    + if (!is_nested(svm))
    + return 0;

    - return 0;
    + svm->vmcb->control.exit_code = SVM_EXIT_EXCP_BASE + nr;
    + svm->vmcb->control.exit_code_hi = 0;
    + svm->vmcb->control.exit_info_1 = error_code;
    + svm->vmcb->control.exit_info_2 = svm->vcpu.arch.cr2;
    +
    + return nested_svm_exit_handled(svm, false);
    }

    static inline int nested_svm_intr(struct vcpu_svm *svm)
    --
    1.6.4.1


    \
     
     \ /
      Last update: 2009-08-26 12:33    [W:0.019 / U:128.080 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site