xen/privcmd: Further s/MFN/GFN/ clean-up

The privcmd code is mixing the usage of GFN and MFN within the same
functions which make the code difficult to understand when you only work
with auto-translated guests.

The privcmd driver is only dealing with GFN so replace all the mention
of MFN into GFN.

The ioctl structure used to map foreign change has been left unchanged
given that the userspace is using it. Nonetheless, add a comment to
explain the expected value within the "mfn" field.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
index 58a5389aec89..cff23872c5a9 100644
--- a/drivers/xen/xlate_mmu.c
+++ b/drivers/xen/xlate_mmu.c
@@ -38,8 +38,8 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/memory.h>
 
-/* map fgmfn of domid to lpfn in the current domain */
-static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,
+/* map fgfn of domid to lpfn in the current domain */
+static int map_foreign_page(unsigned long lpfn, unsigned long fgfn,
                             unsigned int domid)
 {
         int rc;
@@ -49,7 +49,7 @@ static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,
                 .size = 1,
                 .space = XENMAPSPACE_gmfn_foreign,
         };
-        xen_ulong_t idx = fgmfn;
+        xen_ulong_t idx = fgfn;
         xen_pfn_t gpfn = lpfn;
         int err = 0;
 
@@ -62,13 +62,13 @@ static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,
 }
 
 struct remap_data {
-        xen_pfn_t *fgmfn; /* foreign domain's gmfn */
+        xen_pfn_t *fgfn; /* foreign domain's gfn */
         pgprot_t prot;
         domid_t  domid;
         struct vm_area_struct *vma;
         int index;
         struct page **pages;
-        struct xen_remap_mfn_info *info;
+        struct xen_remap_gfn_info *info;
         int *err_ptr;
         int mapped;
 };
@@ -82,20 +82,20 @@ static int remap_pte_fn(pte_t *ptep, pgtable_t token, unsigned long addr,
         pte_t pte = pte_mkspecial(pfn_pte(pfn, info->prot));
         int rc;
 
-        rc = map_foreign_page(pfn, *info->fgmfn, info->domid);
+        rc = map_foreign_page(pfn, *info->fgfn, info->domid);
         *info->err_ptr++ = rc;
         if (!rc) {
                 set_pte_at(info->vma->vm_mm, addr, ptep, pte);
                 info->mapped++;
         }
-        info->fgmfn++;
+        info->fgfn++;
 
         return 0;
 }
 
 int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
                               unsigned long addr,
-                              xen_pfn_t *mfn, int nr,
+                              xen_pfn_t *gfn, int nr,
                               int *err_ptr, pgprot_t prot,
                               unsigned domid,
                               struct page **pages)
@@ -108,7 +108,7 @@ int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
            x86 PVOPS */
         BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_IO)) == (VM_PFNMAP | VM_IO)));
 
-        data.fgmfn = mfn;
+        data.fgfn = gfn;
         data.prot  = prot;
         data.domid = domid;
         data.vma   = vma;