WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

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

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Define gnttab_shared_gpfn() for use in common code.
From: Xen patchbot -3.0-testing <patchbot-3.0-testing@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 08 Feb 2006 01:08:15 +0000
Delivery-date: Wed, 08 Feb 2006 01:20:01 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID bc9f304c88a178f2216457e03964b399cc5e5028
# Parent  c5fa9bb0aad76372dd2917feaa2721ad3cf73389
Define gnttab_shared_gpfn() for use in common code.

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

diff -r c5fa9bb0aad7 -r bc9f304c88a1 xen/common/grant_table.c
--- a/xen/common/grant_table.c  Tue Jan 31 18:55:08 2006
+++ b/xen/common/grant_table.c  Tue Jan 31 23:49:56 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 c5fa9bb0aad7 -r bc9f304c88a1 xen/include/asm-ia64/grant_table.h
--- a/xen/include/asm-ia64/grant_table.h        Tue Jan 31 18:55:08 2006
+++ b/xen/include/asm-ia64/grant_table.h        Tue Jan 31 23:49:56 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 c5fa9bb0aad7 -r bc9f304c88a1 xen/include/asm-x86/grant_table.h
--- a/xen/include/asm-x86/grant_table.h Tue Jan 31 18:55:08 2006
+++ b/xen/include/asm-x86/grant_table.h Tue Jan 31 23:49:56 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

<Prev in Thread] Current Thread [Next in Thread>