aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/mmu.c
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>2013-02-05 02:27:27 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2013-02-06 19:42:08 -0500
commitf761620377ebc791afba7ded078947d2116f48ce (patch)
tree78513763054bb53cb3e837acead724ac2682c9ab /arch/x86/kvm/mmu.c
parent55dd98c3a81e243447d5fbf496fa8b909ef3b7f6 (diff)
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>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r--arch/x86/kvm/mmu.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 5356d8d2d496..e956e9bed294 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2388,16 +2388,15 @@ done:
2388} 2388}
2389 2389
2390static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 2390static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
2391 unsigned pt_access, unsigned pte_access, 2391 unsigned pte_access, int write_fault, int *emulate,
2392 int write_fault, int *emulate, int level, gfn_t gfn, 2392 int level, gfn_t gfn, pfn_t pfn, bool speculative,
2393 pfn_t pfn, bool speculative, bool host_writable) 2393 bool host_writable)
2394{ 2394{
2395 int was_rmapped = 0; 2395 int was_rmapped = 0;
2396 int rmap_count; 2396 int rmap_count;
2397 2397
2398 pgprintk("%s: spte %llx access %x write_fault %d gfn %llx\n", 2398 pgprintk("%s: spte %llx write_fault %d gfn %llx\n", __func__,
2399 __func__, *sptep, pt_access, 2399 *sptep, write_fault, gfn);
2400 write_fault, gfn);
2401 2400
2402 if (is_rmap_spte(*sptep)) { 2401 if (is_rmap_spte(*sptep)) {
2403 /* 2402 /*
@@ -2513,7 +2512,7 @@ static int direct_pte_prefetch_many(struct kvm_vcpu *vcpu,
2513 return -1; 2512 return -1;
2514 2513
2515 for (i = 0; i < ret; i++, gfn++, start++) 2514 for (i = 0; i < ret; i++, gfn++, start++)
2516 mmu_set_spte(vcpu, start, ACC_ALL, access, 0, NULL, 2515 mmu_set_spte(vcpu, start, access, 0, NULL,
2517 sp->role.level, gfn, page_to_pfn(pages[i]), 2516 sp->role.level, gfn, page_to_pfn(pages[i]),
2518 true, true); 2517 true, true);
2519 2518
@@ -2574,9 +2573,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
2574 2573
2575 for_each_shadow_entry(vcpu, (u64)gfn << PAGE_SHIFT, iterator) { 2574 for_each_shadow_entry(vcpu, (u64)gfn << PAGE_SHIFT, iterator) {
2576 if (iterator.level == level) { 2575 if (iterator.level == level) {
2577 unsigned pte_access = ACC_ALL; 2576 mmu_set_spte(vcpu, iterator.sptep, ACC_ALL,
2578
2579 mmu_set_spte(vcpu, iterator.sptep, ACC_ALL, pte_access,
2580 write, &emulate, level, gfn, pfn, 2577 write, &emulate, level, gfn, pfn,
2581 prefault, map_writable); 2578 prefault, map_writable);
2582 direct_pte_prefetch(vcpu, iterator.sptep); 2579 direct_pte_prefetch(vcpu, iterator.sptep);