lkml.org 
[lkml]   [2009]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 9/9] KVM: SVM: Remove nsvm_printk debugging code
    Date
    With all important informations now delivered through
    tracepoints we can savely remove the nsvm_printk debugging
    code for nested svm.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kvm/svm.c | 34 ----------------------------------
    1 files changed, 0 insertions(+), 34 deletions(-)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index 8b9f6fb..69610c5 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -53,15 +53,6 @@ MODULE_LICENSE("GPL");

    #define DEBUGCTL_RESERVED_BITS (~(0x3fULL))

    -/* Turn on to get debugging output*/
    -/* #define NESTED_DEBUG */
    -
    -#ifdef NESTED_DEBUG
    -#define nsvm_printk(fmt, args...) printk(KERN_INFO fmt, ## args)
    -#else
    -#define nsvm_printk(fmt, args...) do {} while(0)
    -#endif
    -
    static const u32 host_save_user_msrs[] = {
    #ifdef CONFIG_X86_64
    MSR_STAR, MSR_LSTAR, MSR_CSTAR, MSR_SYSCALL_MASK, MSR_KERNEL_GS_BASE,
    @@ -1540,14 +1531,12 @@ static int nested_svm_exit_handled(struct vcpu_svm *svm)
    }
    default: {
    u64 exit_bits = 1ULL << (exit_code - SVM_EXIT_INTR);
    - nsvm_printk("exit code: 0x%x\n", exit_code);
    if (svm->nested.intercept & exit_bits)
    vmexit = NESTED_EXIT_DONE;
    }
    }

    if (vmexit == NESTED_EXIT_DONE) {
    - nsvm_printk("#VMEXIT reason=%04x\n", exit_code);
    nested_svm_vmexit(svm);
    }

    @@ -1658,10 +1647,6 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
    /* Restore the original control entries */
    copy_vmcb_control_area(vmcb, hsave);

    - /* Kill any pending exceptions */
    - if (svm->vcpu.arch.exception.pending == true)
    - nsvm_printk("WARNING: Pending Exception\n");
    -
    kvm_clear_exception_queue(&svm->vcpu);
    kvm_clear_interrupt_queue(&svm->vcpu);

    @@ -1826,25 +1811,14 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)

    force_new_asid(&svm->vcpu);
    svm->vmcb->control.int_ctl = nested_vmcb->control.int_ctl | V_INTR_MASKING_MASK;
    - if (nested_vmcb->control.int_ctl & V_IRQ_MASK) {
    - nsvm_printk("nSVM Injecting Interrupt: 0x%x\n",
    - nested_vmcb->control.int_ctl);
    - }
    if (nested_vmcb->control.int_ctl & V_INTR_MASKING_MASK)
    svm->vcpu.arch.hflags |= HF_VINTR_MASK;
    else
    svm->vcpu.arch.hflags &= ~HF_VINTR_MASK;

    - nsvm_printk("nSVM exit_int_info: 0x%x | int_state: 0x%x\n",
    - nested_vmcb->control.exit_int_info,
    - nested_vmcb->control.int_state);
    -
    svm->vmcb->control.int_vector = nested_vmcb->control.int_vector;
    svm->vmcb->control.int_state = nested_vmcb->control.int_state;
    svm->vmcb->control.tsc_offset += nested_vmcb->control.tsc_offset;
    - if (nested_vmcb->control.event_inj & SVM_EVTINJ_VALID)
    - nsvm_printk("Injecting Event: 0x%x\n",
    - nested_vmcb->control.event_inj);
    svm->vmcb->control.event_inj = nested_vmcb->control.event_inj;
    svm->vmcb->control.event_inj_err = nested_vmcb->control.event_inj_err;

    @@ -1913,8 +1887,6 @@ static int vmsave_interception(struct vcpu_svm *svm)

    static int vmrun_interception(struct vcpu_svm *svm)
    {
    - nsvm_printk("VMrun\n");
    -
    if (nested_svm_check_permissions(svm))
    return 1;

    @@ -1974,7 +1946,6 @@ static int clgi_interception(struct vcpu_svm *svm)
    static int invlpga_interception(struct vcpu_svm *svm)
    {
    struct kvm_vcpu *vcpu = &svm->vcpu;
    - nsvm_printk("INVLPGA\n");

    trace_kvm_invlpga(svm->vmcb->save.rip, vcpu->arch.regs[VCPU_REGS_RCX],
    vcpu->arch.regs[VCPU_REGS_RAX]);
    @@ -2389,10 +2360,6 @@ static int handle_exit(struct kvm_vcpu *vcpu)
    svm->vmcb->control.exit_int_info,
    svm->vmcb->control.exit_int_info_err);

    - nsvm_printk("nested handle_exit: 0x%x | 0x%lx | 0x%lx | 0x%lx\n",
    - exit_code, svm->vmcb->control.exit_info_1,
    - svm->vmcb->control.exit_info_2, svm->vmcb->save.rip);
    -
    vmexit = nested_svm_exit_special(svm);

    if (vmexit == NESTED_EXIT_CONTINUE)
    @@ -2539,7 +2506,6 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu)
    static void enable_irq_window(struct kvm_vcpu *vcpu)
    {
    struct vcpu_svm *svm = to_svm(vcpu);
    - nsvm_printk("Trying to open IRQ window\n");

    nested_svm_intr(svm);

    --
    1.6.4.3



    \
     
     \ /
      Last update: 2009-10-09 19:01    [W:0.030 / U:430.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site