[Xen-devel] [V3 PATCH 2/9] PVH dom0: create add_mem_mapping_for_xlate() function

[Mukesh Rathor <mukesh.rathor@xxxxxxxxxx>]

In this preparatory patch, add portion of XEN_DOMCTL_memory_mapping
code is put into a function so it can be called later for PVH from
construct_dom0. There is no change in it's functionality.
The function is made non-static in the construct_dom0 patch.

Signed-off-by: Mukesh Rathor <mukesh.rathor@xxxxxxxxxx>
---
 xen/arch/x86/domctl.c |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 8644218..e3f544a 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -46,6 +46,35 @@ static int gdbsx_guest_mem_io(
     return (iop->remain ? -EFAULT : 0);
 }
 
+static int add_mem_mapping_for_xlate(struct domain *d, unsigned long gfn,
+                              unsigned long mfn, unsigned long nr_mfns)
+{
+    unsigned long i;
+    int ret = 0;
+
+    for ( i = 0; i < nr_mfns; i++ )
+        if ( !set_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)) )
+            ret = -EIO;
+    if ( ret )
+    {
+        if ( is_hardware_domain(d) )
+            panic("Failed setting p2m. ret:%d gfn:%lx mfn:%lx i:%ld\n",
+                  ret, gfn, mfn, i);
+
+        printk(XENLOG_G_WARNING
+               "memory_map:fail: dom%d gfn=%lx mfn=%lx\n",
+               d->domain_id, gfn + i, mfn + i);
+        while ( i-- )
+            clear_mmio_p2m_entry(d, gfn + i);
+        if ( iomem_deny_access(d, mfn, mfn + nr_mfns - 1) &&
+             is_hardware_domain(current->domain) )
+            printk(XENLOG_ERR
+                   "memory_map: failed to deny dom%d access to [%lx,%lx]\n",
+                   d->domain_id, mfn, mfn + nr_mfns - 1);
+    }
+    return ret;
+}
+
 long arch_do_domctl(
     struct xen_domctl *domctl, struct domain *d,
     XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
@@ -649,24 +678,7 @@ long arch_do_domctl(
 
             ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1);
             if ( !ret && paging_mode_translate(d) )
-            {
-                for ( i = 0; !ret && i < nr_mfns; i++ )
-                    if ( !set_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)) )
-                        ret = -EIO;
-                if ( ret )
-                {
-                    printk(XENLOG_G_WARNING
-                           "memory_map:fail: dom%d gfn=%lx mfn=%lx\n",
-                           d->domain_id, gfn + i, mfn + i);
-                    while ( i-- )
-                        clear_mmio_p2m_entry(d, gfn + i);
-                    if ( iomem_deny_access(d, mfn, mfn + nr_mfns - 1) &&
-                         is_hardware_domain(current->domain) )
-                        printk(XENLOG_ERR
-                               "memory_map: failed to deny dom%d access to 
[%lx,%lx]\n",
-                               d->domain_id, mfn, mfn + nr_mfns - 1);
-                }
-            }
+                ret = add_mem_mapping_for_xlate(d, gfn, mfn, nr_mfns);
         }
         else
         {
-- 
1.7.2.3


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel