]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
KVM: MMU: remove valueless output message
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Tue, 27 Jul 2010 03:21:18 +0000 (11:21 +0800)
committerAvi Kivity <avi@redhat.com>
Sun, 24 Oct 2010 08:50:02 +0000 (10:50 +0200)
After commit 53383eaad08d, the '*spte' has updated before call
rmap_remove()(in most case it's 'shadow_trap_nonpresent_pte'), so
remove this information from error message

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/x86/kvm/mmu.c

index 311f6dad89513385a8f9de804baa651a02b84e39..82f7622c17d3669d87f4b300815b0552223fb912 100644 (file)
@@ -645,18 +645,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) {
@@ -670,7 +669,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();
        }
 }