From 9edba6da0115f6cc0cf1fed47ed8cdef05c0e1fe Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 29 May 2008 14:56:28 +0300 Subject: [PATCH] --- yaml --- r: 103723 b: refs/heads/master c: 131d82791b628d4aeafd94ddc74a9b68f3d15a83 h: refs/heads/master i: 103721: 3806d7a4d4f41e3c5845dcf6e4ced481c8c9eec7 103719: 2f3e1302f30e629a789718e61db5fb602f2abeb6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/mmu.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fcc316c5c177..524486394462 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d761a501cf9cd4fa08ff35d252ff08b8c31ce677 +refs/heads/master: 131d82791b628d4aeafd94ddc74a9b68f3d15a83 diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c index 62741b7c4223..5ebb2788bd73 100644 --- a/trunk/arch/x86/kvm/mmu.c +++ b/trunk/arch/x86/kvm/mmu.c @@ -850,7 +850,10 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu, hlist_add_head(&sp->hash_link, bucket); if (!metaphysical) rmap_write_protect(vcpu->kvm, gfn); - vcpu->arch.mmu.prefetch_page(vcpu, sp); + if (shadow_trap_nonpresent_pte != shadow_notrap_nonpresent_pte) + vcpu->arch.mmu.prefetch_page(vcpu, sp); + else + nonpaging_prefetch_page(vcpu, sp); return sp; }