lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: MMU: remove valueless output message

Browse Source 
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>
This commit is contained in:
Xiao Guangrong 2010-07-27 11:21:18 +08:00 committed by Avi Kivity
parent d359192fea
commit 19ada5c4b6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kvm/mmu.c
View File

@ -645,18 +645,17 @@ static void rmap_remove(struct kvm *kvm, u64 *spte)
gfn = kvm_mmu_page_get_gfn(sp, spte - sp->spt); gfn = kvm_mmu_page_get_gfn(sp, spte - sp->spt);
rmapp = gfn_to_rmap(kvm, gfn, sp->role.level); rmapp = gfn_to_rmap(kvm, gfn, sp->role.level);
if (!*rmapp) { 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(); BUG();
} else if (!(*rmapp & 1)) { } 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) { if ((u64 *)*rmapp != spte) {
printk(KERN_ERR "rmap_remove: %p %llx 1->BUG\n", printk(KERN_ERR "rmap_remove: %p 1->BUG\n", spte);
spte, *spte);
BUG(); BUG();
} }
*rmapp = 0; *rmapp = 0;
} else { } 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); desc = (struct kvm_rmap_desc *)(*rmapp & ~1ul);
prev_desc = NULL; prev_desc = NULL;
while (desc) { while (desc) {
@ -670,7 +669,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte)
prev_desc = desc; prev_desc = desc;
desc = desc->more; desc = desc->more;
} }
pr_err("rmap_remove: %p %llx many->many\n", spte, *spte); pr_err("rmap_remove: %p many->many\n", spte);
BUG(); BUG();
} }
} }