Convert gfn_to_page() to the new kvm_follow_pfn() internal API, which will
eventually allow removing gfn_to_pfn() and kvm_pfn_to_refcounted_page().

Tested-by: Alex Bennée <alex.ben...@linaro.org>
Signed-off-by: Sean Christopherson <sea...@google.com>
---
 virt/kvm/kvm_main.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 696d5e429b3e..1782242a4800 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3145,14 +3145,16 @@ EXPORT_SYMBOL_GPL(kvm_prefetch_pages);
  */
 struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn)
 {
-       kvm_pfn_t pfn;
+       struct page *refcounted_page = NULL;
+       struct kvm_follow_pfn kfp = {
+               .slot = gfn_to_memslot(kvm, gfn),
+               .gfn = gfn,
+               .flags = FOLL_WRITE,
+               .refcounted_page = &refcounted_page,
+       };
 
-       pfn = gfn_to_pfn(kvm, gfn);
-
-       if (is_error_noslot_pfn(pfn))
-               return NULL;
-
-       return kvm_pfn_to_refcounted_page(pfn);
+       (void)kvm_follow_pfn(&kfp);
+       return refcounted_page;
 }
 EXPORT_SYMBOL_GPL(gfn_to_page);
 
-- 
2.47.0.rc1.288.g06298d1525-goog


Reply via email to