aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm/kvm_main.c
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>2012-07-17 09:56:16 -0400
committerMarcelo Tosatti <mtosatti@redhat.com>2012-07-19 20:25:24 -0400
commitd566104853361cc377c61f70e41c1ad3d44b86c6 (patch)
tree6b77f5e4f299bfb0d6c3fa7b3768e7299539f8af /virt/kvm/kvm_main.c
parentf340a51b7e41abbe92ae3a327c0020974a059f95 (diff)
KVM: remove the unused parameter of gfn_to_pfn_memslot
The parameter, 'kvm', is not used in gfn_to_pfn_memslot, we can happily remove it Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r--virt/kvm/kvm_main.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f955eee92aa9..68dda513cd72 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1062,8 +1062,8 @@ static inline int check_user_page_hwpoison(unsigned long addr)
1062 return rc == -EHWPOISON; 1062 return rc == -EHWPOISON;
1063} 1063}
1064 1064
1065static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic, 1065static pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async,
1066 bool *async, bool write_fault, bool *writable) 1066 bool write_fault, bool *writable)
1067{ 1067{
1068 struct page *page[1]; 1068 struct page *page[1];
1069 int npages = 0; 1069 int npages = 0;
@@ -1143,9 +1143,9 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic,
1143 return pfn; 1143 return pfn;
1144} 1144}
1145 1145
1146pfn_t hva_to_pfn_atomic(struct kvm *kvm, unsigned long addr) 1146pfn_t hva_to_pfn_atomic(unsigned long addr)
1147{ 1147{
1148 return hva_to_pfn(kvm, addr, true, NULL, true, NULL); 1148 return hva_to_pfn(addr, true, NULL, true, NULL);
1149} 1149}
1150EXPORT_SYMBOL_GPL(hva_to_pfn_atomic); 1150EXPORT_SYMBOL_GPL(hva_to_pfn_atomic);
1151 1151
@@ -1163,7 +1163,7 @@ static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic, bool *async,
1163 return page_to_pfn(bad_page); 1163 return page_to_pfn(bad_page);
1164 } 1164 }
1165 1165
1166 return hva_to_pfn(kvm, addr, atomic, async, write_fault, writable); 1166 return hva_to_pfn(addr, atomic, async, write_fault, writable);
1167} 1167}
1168 1168
1169pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn) 1169pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn)
@@ -1192,11 +1192,10 @@ pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,
1192} 1192}
1193EXPORT_SYMBOL_GPL(gfn_to_pfn_prot); 1193EXPORT_SYMBOL_GPL(gfn_to_pfn_prot);
1194 1194
1195pfn_t gfn_to_pfn_memslot(struct kvm *kvm, 1195pfn_t gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn)
1196 struct kvm_memory_slot *slot, gfn_t gfn)
1197{ 1196{
1198 unsigned long addr = gfn_to_hva_memslot(slot, gfn); 1197 unsigned long addr = gfn_to_hva_memslot(slot, gfn);
1199 return hva_to_pfn(kvm, addr, false, NULL, true, NULL); 1198 return hva_to_pfn(addr, false, NULL, true, NULL);
1200} 1199}
1201 1200
1202int gfn_to_page_many_atomic(struct kvm *kvm, gfn_t gfn, struct page **pages, 1201int gfn_to_page_many_atomic(struct kvm *kvm, gfn_t gfn, struct page **pages,