Commit 19ada5c4 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

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 from error message

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent d359192f

arch/x86/kvm/mmu.c

+5 −6
Original line number Diff line number Diff line
@@ -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();

	}

}