diff options
| author |   Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2010-11-12 14:49:55 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2011-01-12 11:29:14 +0200 |
| commit | c4806acdcec020fe5bbb054ce9dc75aaecaf29dd (patch) | |
| tree | 0fafeeb72efdb8985165fcab0a24ffcc5071653c /arch/x86/kvm/x86.c | |
| parent | KVM: MMU: support apf for nonpaing guest (diff) | |
| download | linux-dev-c4806acdcec020fe5bbb054ce9dc75aaecaf29dd.tar.xz linux-dev-c4806acdcec020fe5bbb054ce9dc75aaecaf29dd.zip | |
KVM: MMU: fix apf prefault if nested guest is enabled
If apf is generated in L2 guest and is completed in L1 guest, it will
prefault this apf in L1 guest's mmu context.
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9b875ff05410..c673e726fbdb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6168,7 +6168,8 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, struct kvm_async_pf *work) { int r; - if (!vcpu->arch.mmu.direct_map || is_error_page(work->page)) + if (!vcpu->arch.mmu.direct_map || !work->arch.direct_map || + is_error_page(work->page)) return; r = kvm_mmu_reload(vcpu); |