summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2011-02-21 11:21:30 +0800
committerMarcelo Tosatti <mtosatti@redhat.com>2011-03-17 13:08:31 -0300
commitd170c4190630bcbeb5db266e79ad7a174902e5de (patch)
tree29f190084b646b11b401ecdbf355679e356d67d5
parent93ea5388ead5d7b87f54b8de53e35231acec8bbe (diff)
downloadblackbird-obmc-linux-d170c4190630bcbeb5db266e79ad7a174902e5de.tar.gz
blackbird-obmc-linux-d170c4190630bcbeb5db266e79ad7a174902e5de.zip
KVM: Clear async page fault hash after switching to real mode
The hash array of async gfns may still contain some left gfns after kvm_clear_async_pf_completion_queue() called, need to clear them. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 17af71da63ad..dae2d15c49eb 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -525,8 +525,10 @@ int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
kvm_x86_ops->set_cr0(vcpu, cr0);
- if ((cr0 ^ old_cr0) & X86_CR0_PG)
+ if ((cr0 ^ old_cr0) & X86_CR0_PG) {
kvm_clear_async_pf_completion_queue(vcpu);
+ kvm_async_pf_hash_reset(vcpu);
+ }
if ((cr0 ^ old_cr0) & update_bits)
kvm_mmu_reset_context(vcpu);
OpenPOWER on IntegriCloud