[Xen-changelog] Define gnttab_shared_gpfn() for use in common code.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f081663ba9417dd03f83c9f463f5a47024eea0a8
# Parent  80890ad194b130af654d8c70b5bf334c96ecf846
Define gnttab_shared_gpfn() for use in common code.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 80890ad194b1 -r f081663ba941 xen/common/grant_table.c
--- a/xen/common/grant_table.c  Tue Jan 31 23:20:29 2006
+++ b/xen/common/grant_table.c  Tue Jan 31 23:48:17 2006
@@ -481,7 +481,7 @@
     gnttab_setup_table_t  op;
     struct domain        *d;
     int                   i;
-    unsigned long         mfn;
+    unsigned long         gpfn;
 
     if ( count != 1 )
         return -EINVAL;
@@ -523,8 +523,8 @@
         (void)put_user(GNTST_okay, &uop->status);
         for ( i = 0; i < op.nr_frames; i++ )
         {
-            mfn = __mfn_to_gpfn(d, gnttab_shared_mfn(d, d->grant_table, i));
-            (void)put_user(mfn, &op.frame_list[i]);
+            gpfn = gnttab_shared_gpfn(d, d->grant_table, i);
+            (void)put_user(gpfn, &op.frame_list[i]);
         }
     }
 
diff -r 80890ad194b1 -r f081663ba941 xen/include/asm-ia64/grant_table.h
--- a/xen/include/asm-ia64/grant_table.h        Tue Jan 31 23:20:29 2006
+++ b/xen/include/asm-ia64/grant_table.h        Tue Jan 31 23:48:17 2006
@@ -14,7 +14,7 @@
 
 #define gnttab_create_shared_mfn(d, t, i) ((void)0)
 
-#define gnttab_shared_mfn(d, t, i)                                      \
+#define gnttab_shared_gpfn(d, t, i)                                     \
     ( ((d) == dom0) ?                                                   \
       ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i)) :               \
       (map_domain_page((d), 1UL<<40, virt_to_phys((t)->shared)),        \
diff -r 80890ad194b1 -r f081663ba941 xen/include/asm-x86/grant_table.h
--- a/xen/include/asm-x86/grant_table.h Tue Jan 31 23:20:29 2006
+++ b/xen/include/asm-x86/grant_table.h Tue Jan 31 23:48:17 2006
@@ -33,6 +33,9 @@
 #define gnttab_shared_mfn(d, t, i)                      \
     ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i))
 
+#define gnttab_shared_gpfn(d, t, i)                     \
+    (__mfn_to_gpfn(d, gnttab_shared_mfn(d, t, i)))
+
 #define gnttab_log_dirty(d, f) mark_dirty((d), (f))
 
 #endif /* __ASM_GRANT_TABLE_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog