lkml.org 
[lkml]   [2010]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/4] KVM: MMU: remove valueless output message
    After commit 53383eaad08d, the '*spte' has updated before call
    rmap_remove()(in most case it's 'shadow_trap_nonpresent_pte'), so
    remove this information form error message

    Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    ---
    arch/x86/kvm/mmu.c | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
    index 5e9d4a0..c07a5eb 100644
    --- a/arch/x86/kvm/mmu.c
    +++ b/arch/x86/kvm/mmu.c
    @@ -662,18 +662,17 @@ static void rmap_remove(struct kvm *kvm, u64 *spte)
    gfn = kvm_mmu_page_get_gfn(sp, spte - sp->spt);
    rmapp = gfn_to_rmap(kvm, gfn, sp->role.level);
    if (!*rmapp) {
    - printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte);
    + printk(KERN_ERR "rmap_remove: %p 0->BUG\n", spte);
    BUG();
    } else if (!(*rmapp & 1)) {
    - rmap_printk("rmap_remove: %p %llx 1->0\n", spte, *spte);
    + rmap_printk("rmap_remove: %p 1->0\n", spte);
    if ((u64 *)*rmapp != spte) {
    - printk(KERN_ERR "rmap_remove: %p %llx 1->BUG\n",
    - spte, *spte);
    + printk(KERN_ERR "rmap_remove: %p 1->BUG\n", spte);
    BUG();
    }
    *rmapp = 0;
    } else {
    - rmap_printk("rmap_remove: %p %llx many->many\n", spte, *spte);
    + rmap_printk("rmap_remove: %p many->many\n", spte);
    desc = (struct kvm_rmap_desc *)(*rmapp & ~1ul);
    prev_desc = NULL;
    while (desc) {
    @@ -687,7 +686,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte)
    prev_desc = desc;
    desc = desc->more;
    }
    - pr_err("rmap_remove: %p %llx many->many\n", spte, *spte);
    + pr_err("rmap_remove: %p many->many\n", spte);
    BUG();
    }
    }
    --
    1.6.1.2



    \
     
     \ /
      Last update: 2010-07-13 11:53    [W:0.030 / U:61.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site