openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: MMU: remove pt_access in mmu_set_spte 

It is only used in debug code, so drop it

Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Xiao Guangrong 2013-02-05 15:27:27 +08:00 committed by Marcelo Tosatti
parent 55dd98c3a8
commit f761620377
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kvm/mmu.c
View File

@ -2388,16 +2388,15 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
} }
static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
unsigned pt_access, unsigned pte_access, unsigned pte_access, int write_fault, int *emulate,
int write_fault, int *emulate, int level, gfn_t gfn, int level, gfn_t gfn, pfn_t pfn, bool speculative,
pfn_t pfn, bool speculative, bool host_writable) bool host_writable)
{ {
int was_rmapped = 0; int was_rmapped = 0;
int rmap_count; int rmap_count;
pgprintk("%s: spte %llx access %x write_fault %d gfn %llx\n", pgprintk("%s: spte %llx write_fault %d gfn %llx\n", __func__,
__func__, *sptep, pt_access, *sptep, write_fault, gfn);
write_fault, gfn);
if (is_rmap_spte(*sptep)) { if (is_rmap_spte(*sptep)) {
/* /*
@ -2513,7 +2512,7 @@ static int direct_pte_prefetch_many(struct kvm_vcpu *vcpu,
return -1; return -1;
for (i = 0; i < ret; i++, gfn++, start++) for (i = 0; i < ret; i++, gfn++, start++)
mmu_set_spte(vcpu, start, ACC_ALL, access, 0, NULL, mmu_set_spte(vcpu, start, access, 0, NULL,
sp->role.level, gfn, page_to_pfn(pages[i]), sp->role.level, gfn, page_to_pfn(pages[i]),
true, true); true, true);
@ -2574,9 +2573,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
for_each_shadow_entry(vcpu, (u64)gfn << PAGE_SHIFT, iterator) { for_each_shadow_entry(vcpu, (u64)gfn << PAGE_SHIFT, iterator) {
if (iterator.level == level) { if (iterator.level == level) {
unsigned pte_access = ACC_ALL; mmu_set_spte(vcpu, iterator.sptep, ACC_ALL,
mmu_set_spte(vcpu, iterator.sptep, ACC_ALL, pte_access,
write, &emulate, level, gfn, pfn, write, &emulate, level, gfn, pfn,
prefault, map_writable); prefault, map_writable);
direct_pte_prefetch(vcpu, iterator.sptep); direct_pte_prefetch(vcpu, iterator.sptep);

9
arch/x86/kvm/paging_tmpl.h
View File

@ -326,8 +326,8 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
* we call mmu_set_spte() with host_writable = true because * we call mmu_set_spte() with host_writable = true because
* pte_prefetch_gfn_to_pfn always gets a writable pfn. * pte_prefetch_gfn_to_pfn always gets a writable pfn.
*/ */
mmu_set_spte(vcpu, spte, sp->role.access, pte_access, 0, mmu_set_spte(vcpu, spte, pte_access, 0, NULL, PT_PAGE_TABLE_LEVEL,
NULL, PT_PAGE_TABLE_LEVEL, gfn, pfn, true, true); gfn, pfn, true, true);
return true; return true;
} }
@ -470,9 +470,8 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
} }
clear_sp_write_flooding_count(it.sptep); clear_sp_write_flooding_count(it.sptep);
mmu_set_spte(vcpu, it.sptep, access, gw->pte_access, mmu_set_spte(vcpu, it.sptep, gw->pte_access, write_fault, &emulate,
write_fault, &emulate, it.level, it.level, gw->gfn, pfn, prefault, map_writable);
gw->gfn, pfn, prefault, map_writable);
FNAME(pte_prefetch)(vcpu, gw, it.sptep); FNAME(pte_prefetch)(vcpu, gw, it.sptep);
return emulate; return emulate;