diff options
author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2010-07-26 23:21:18 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:50:02 -0400 |
commit | 19ada5c4b6170bbc7ac4f2f38dba0068fdc7755a (patch) | |
tree | 1a23685f1b6194e1b08b7dd434ab8a622acdc864 | |
parent | d359192feaf02861327339a9dda6b2b2d765c2bc (diff) |
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: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | 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 311f6dad8951..82f7622c17d3 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -645,18 +645,17 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) | |||
645 | gfn = kvm_mmu_page_get_gfn(sp, spte - sp->spt); | 645 | gfn = kvm_mmu_page_get_gfn(sp, spte - sp->spt); |
646 | rmapp = gfn_to_rmap(kvm, gfn, sp->role.level); | 646 | rmapp = gfn_to_rmap(kvm, gfn, sp->role.level); |
647 | if (!*rmapp) { | 647 | if (!*rmapp) { |
648 | printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte); | 648 | printk(KERN_ERR "rmap_remove: %p 0->BUG\n", spte); |
649 | BUG(); | 649 | BUG(); |
650 | } else if (!(*rmapp & 1)) { | 650 | } else if (!(*rmapp & 1)) { |
651 | rmap_printk("rmap_remove: %p %llx 1->0\n", spte, *spte); | 651 | rmap_printk("rmap_remove: %p 1->0\n", spte); |
652 | if ((u64 *)*rmapp != spte) { | 652 | if ((u64 *)*rmapp != spte) { |
653 | printk(KERN_ERR "rmap_remove: %p %llx 1->BUG\n", | 653 | printk(KERN_ERR "rmap_remove: %p 1->BUG\n", spte); |
654 | spte, *spte); | ||
655 | BUG(); | 654 | BUG(); |
656 | } | 655 | } |
657 | *rmapp = 0; | 656 | *rmapp = 0; |
658 | } else { | 657 | } else { |
659 | rmap_printk("rmap_remove: %p %llx many->many\n", spte, *spte); | 658 | rmap_printk("rmap_remove: %p many->many\n", spte); |
660 | desc = (struct kvm_rmap_desc *)(*rmapp & ~1ul); | 659 | desc = (struct kvm_rmap_desc *)(*rmapp & ~1ul); |
661 | prev_desc = NULL; | 660 | prev_desc = NULL; |
662 | while (desc) { | 661 | while (desc) { |
@@ -670,7 +669,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) | |||
670 | prev_desc = desc; | 669 | prev_desc = desc; |
671 | desc = desc->more; | 670 | desc = desc->more; |
672 | } | 671 | } |
673 | pr_err("rmap_remove: %p %llx many->many\n", spte, *spte); | 672 | pr_err("rmap_remove: %p many->many\n", spte); |
674 | BUG(); | 673 | BUG(); |
675 | } | 674 | } |
676 | } | 675 | } |