New XENMAPSPACE_gmfn parameter for XENMEM_add_to_physmap.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

xen/arch/ia64/xen/mm.c

@@ -3295,13 +3295,16 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
 
             spin_unlock(&d->grant_table->lock);
             break;
-        case XENMAPSPACE_mfn:
-        {
-            if ( get_page_from_pagenr(xatp.idx, d) ) {
+        case XENMAPSPACE_gmfn:
+            xatp.idx = gmfn_to_mfn(d, xatp.idx);
+        case XENMAPSPACE_mfn: {
             struct xen_ia64_memmap_info memmap_info;
             efi_memory_desc_t md;
             int ret;
 
+            if ( !get_page_from_pagenr(xatp.idx, d) )
+                break;
+
             mfn = xatp.idx;
             page = mfn_to_page(mfn);
 
@@ -3327,7 +3330,6 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
                          d->domain_id, xatp.gpfn, xatp.idx, ret);
                 return ret;
             }
-            }
             break;
         }
         default:

xen/arch/x86/mm.c

@@ -3808,14 +3808,14 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
 
             spin_unlock(&d->grant_table->lock);
             break;
+        case XENMAPSPACE_gmfn:
+            xatp.idx = gmfn_to_mfn(d, xatp.idx);
         case XENMAPSPACE_mfn:
-        {
-            if ( get_page_from_pagenr(xatp.idx, d) ) {
+            if ( !get_page_from_pagenr(xatp.idx, d) )
+                break;
             mfn = xatp.idx;
             page = mfn_to_page(mfn);
-            }
             break;
-        }
         default:
             break;
         }

xen/include/public/memory.h

@@ -206,7 +206,8 @@ struct xen_add_to_physmap {
     /* Source mapping space. */
 #define XENMAPSPACE_shared_info 0 /* shared info page */
 #define XENMAPSPACE_grant_table 1 /* grant table page */
-#define XENMAPSPACE_mfn         2 /* usual MFN */
+#define XENMAPSPACE_mfn         2 /* MFN */
+#define XENMAPSPACE_gmfn        3 /* GMFN */
     unsigned int space;
 
     /* Index into source mapping space. */