diff options
| author | Avi Kivity <avi@redhat.com> | 2010-07-13 14:27:06 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-08-02 06:40:42 +0300 |
| commit | a3aa51cfaafe9179add88db20506ccb07e030b47 (patch) | |
| tree | b58ee2e25bb147d2bd4987eb1fa4d4737dd57bc9 | |
| parent | 121eee97a7802acda8b78436cc53196e9885549f (diff) | |
| download | linux-3.10-a3aa51cfaafe9179add88db20506ccb07e030b47.tar.gz linux-3.10-a3aa51cfaafe9179add88db20506ccb07e030b47.tar.bz2 linux-3.10-a3aa51cfaafe9179add88db20506ccb07e030b47.zip | |
KVM: MMU: Add drop_large_spte() helper
To clarify spte fetching code, move large spte handling into a helper.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/mmu.c | 8 | ||||
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 5a6019a534a..b75d6cb44ab 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1492,6 +1492,14 @@ static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp) __set_spte(sptep, spte); } +static void drop_large_spte(struct kvm_vcpu *vcpu, u64 *sptep) +{ + if (is_large_pte(*sptep)) { + drop_spte(vcpu->kvm, sptep, shadow_trap_nonpresent_pte); + kvm_flush_remote_tlbs(vcpu->kvm); + } +} + static void kvm_mmu_page_unlink_children(struct kvm *kvm, struct kvm_mmu_page *sp) { diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 36dc0749c87..0fb7068d64c 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -360,10 +360,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, kvm_flush_remote_tlbs(vcpu->kvm); } - if (is_large_pte(*sptep)) { - drop_spte(vcpu->kvm, sptep, shadow_trap_nonpresent_pte); - kvm_flush_remote_tlbs(vcpu->kvm); - } + drop_large_spte(vcpu, sptep); if (level <= gw->level) { direct = 1; |