Messages in this thread Patch in this message | | | Date | Tue, 12 Jun 2012 10:48:22 +0800 | From | Xiao Guangrong <> | Subject | [PATCH v3 4/6] KVM: pass slot to hva_to_pfn |
| |
This parameter will be used in the later patch
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> --- virt/kvm/kvm_main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c59fad6..811c3ee 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1077,8 +1077,9 @@ static inline int check_user_page_hwpoison(unsigned long addr) return rc == -EHWPOISON; }
-static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic, - bool *async, bool write_fault, bool *writable) +static pfn_t hva_to_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, + unsigned long addr, bool atomic, bool *async, + bool write_fault, bool *writable) { struct page *page[1]; int npages = 0; @@ -1161,18 +1162,22 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic, static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic, bool *async, bool write_fault, bool *writable) { + struct kvm_memory_slot *slot; unsigned long addr;
if (async) *async = false;
- addr = gfn_to_hva(kvm, gfn); + slot = gfn_to_memslot(kvm, gfn); + addr = gfn_to_hva_many(slot, gfn, NULL); + if (kvm_is_error_hva(addr)) { get_page(bad_page); return page_to_pfn(bad_page); }
- return hva_to_pfn(kvm, addr, atomic, async, write_fault, writable); + return hva_to_pfn(kvm, slot, addr, atomic, async, write_fault, + writable); }
pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn) @@ -1205,7 +1210,7 @@ pfn_t gfn_to_pfn_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn) { unsigned long addr = gfn_to_hva_memslot(slot, gfn); - return hva_to_pfn(kvm, addr, false, NULL, true, NULL); + return hva_to_pfn(kvm, slot, addr, false, NULL, true, NULL); }
pfn_t gfn_to_pfn_memslot_atomic(struct kvm *kvm, @@ -1213,7 +1218,7 @@ pfn_t gfn_to_pfn_memslot_atomic(struct kvm *kvm, { unsigned long addr = gfn_to_hva_memslot(slot, gfn);
- return hva_to_pfn(kvm, addr, true, NULL, true, NULL); + return hva_to_pfn(kvm, slot, addr, true, NULL, true, NULL); } EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot_atomic);
-- 1.7.7.6
| |