From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
KVM list <kvm@vger.kernel.org>
Subject: [PATCH 4/4] KVM: MMU: remove valueless output message
Date: Tue, 13 Jul 2010 17:46:51 +0800 [thread overview]
Message-ID: <4C3C360B.1050002@cn.fujitsu.com> (raw)
In-Reply-To: <4C3C3518.7080505@cn.fujitsu.com>
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
next prev parent reply other threads:[~2010-07-13 9:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 9:42 [PATCH 1/4] KVM: MMU: fix forgot reserved bits check in speculative path Xiao Guangrong
2010-07-13 9:43 ` [PATCH 2/4] KVM: MMU: cleanup spte update path Xiao Guangrong
2010-07-13 9:45 ` [PATCH 3/4] KVM: MMU: track dirty page in speculative path properly Xiao Guangrong
2010-07-13 22:05 ` Marcelo Tosatti
2010-07-14 1:24 ` Xiao Guangrong
2010-07-14 11:09 ` Marcelo Tosatti
2010-07-14 13:18 ` Xiao Guangrong
2010-07-14 14:06 ` Marcelo Tosatti
2010-07-14 14:25 ` Avi Kivity
2010-07-15 7:44 ` Xiao Guangrong
2010-07-15 16:40 ` Marcelo Tosatti
2010-07-16 1:58 ` Xiao Guangrong
2010-07-14 5:53 ` Xiao Guangrong
2010-07-13 9:46 ` Xiao Guangrong [this message]
2010-07-13 21:28 ` [PATCH 1/4] KVM: MMU: fix forgot reserved bits check in speculative path Marcelo Tosatti
2010-07-14 1:08 ` Xiao Guangrong
2010-07-14 13:06 ` Avi Kivity
2010-07-14 13:24 ` Xiao Guangrong
2010-07-14 14:27 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C3C360B.1050002@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.