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] Rename translate_gpfn_to_mfn to gpfn_to_mfn_foreign.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Rename translate_gpfn_to_mfn to gpfn_to_mfn_foreign.
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Mon, 04 Apr 2005 10:52:11 +0000
Delivery-date: Tue, 05 Apr 2005 16:21:19 +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 Development List <xen-devel@xxxxxxxxxxxxxxxxxxxxx>
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
ChangeSet 1.1266, 2005/04/04 11:52:11+01:00, mafetter@xxxxxxxxxxxxxxxx

        Rename translate_gpfn_to_mfn to gpfn_to_mfn_foreign.
        Minor bug fix from prior merges.
        
        Signed-off-by: michael.fetterman@xxxxxxxxxxxx



 arch/x86/shadow.c        |   12 ++++++------
 common/grant_table.c     |    2 +-
 include/asm-x86/shadow.h |    8 ++++----
 include/xen/perfc_defn.h |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)


diff -Nru a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c     2005-04-05 12:21:24 -04:00
+++ b/xen/arch/x86/shadow.c     2005-04-05 12:21:24 -04:00
@@ -1245,11 +1245,11 @@
 }
 
 unsigned long
-translate_gpfn_to_mfn(struct domain *d, unsigned long gpfn)
+gpfn_to_mfn_foreign(struct domain *d, unsigned long gpfn)
 {
     ASSERT( shadow_mode_translate(d) );
 
-    perfc_incrc(translate_gpfn_to_mfn);
+    perfc_incrc(gpfn_to_mfn_foreign);
 
     unsigned long va = gpfn << PAGE_SHIFT;
     unsigned long phystab = pagetable_val(d->arch.phys_table);
@@ -1258,7 +1258,7 @@
     unmap_domain_mem(l2);
     if ( !(l2_pgentry_val(l2e) & _PAGE_PRESENT) )
     {
-        printk("translate_gpfn_to_mfn(d->id=%d, gpfn=%p) => 0 l2e=%p\n",
+        printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%p) => 0 l2e=%p\n",
                d->id, gpfn, l2_pgentry_val(l2e));
         return INVALID_MFN;
     }
@@ -1268,13 +1268,13 @@
     unmap_domain_mem(l1);
 
 #if 0
-    printk("translate_gpfn_to_mfn(d->id=%d, gpfn=%p) => %p phystab=%p l2e=%p 
l1tab=%p, l1e=%p\n",
+    printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%p) => %p phystab=%p l2e=%p 
l1tab=%p, l1e=%p\n",
            d->id, gpfn, l1_pgentry_val(l1e) >> PAGE_SHIFT, phystab, l2e, 
l1tab, l1e);
 #endif
 
     if ( !(l1_pgentry_val(l1e) & _PAGE_PRESENT) )
     {
-        printk("translate_gpfn_to_mfn(d->id=%d, gpfn=%p) => 0 l1e=%p\n",
+        printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%p) => 0 l1e=%p\n",
                d->id, gpfn, l1_pgentry_val(l1e));
         return INVALID_MFN;
     }
@@ -2852,7 +2852,7 @@
                 BUG(); // XXX - ought to fix this...
                 break;
             case PGT_snapshot:
-            case PGT_writable_ref:
+            case PGT_writable_pred:
                 break;
             default:
                 errors++;
diff -Nru a/xen/common/grant_table.c b/xen/common/grant_table.c
--- a/xen/common/grant_table.c  2005-04-05 12:21:24 -04:00
+++ b/xen/common/grant_table.c  2005-04-05 12:21:25 -04:00
@@ -193,7 +193,7 @@
 
         /* rmb(); */ /* not on x86 */
 
-        frame = __translate_gpfn_to_mfn(rd, sha->frame);
+        frame = __gpfn_to_mfn_foreign(rd, sha->frame);
 
         if ( unlikely(!pfn_is_ram(frame)) ||
              unlikely(!((flags & GNTMAP_readonly) ?
diff -Nru a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h      2005-04-05 12:21:24 -04:00
+++ b/xen/include/asm-x86/shadow.h      2005-04-05 12:21:24 -04:00
@@ -190,12 +190,12 @@
            phys_to_machine_mapping(gpfn); })           \
       : (gpfn) )
 
-#define __translate_gpfn_to_mfn(_d, gpfn)              \
+#define __gpfn_to_mfn_foreign(_d, gpfn)                \
     ( (shadow_mode_translate(_d))                      \
-      ? translate_gpfn_to_mfn(_d, gpfn)                \
+      ? gpfn_to_mfn_foreign(_d, gpfn)                  \
       : (gpfn) )
 
-extern unsigned long translate_gpfn_to_mfn(
+extern unsigned long gpfn_to_mfn_foreign(
     struct domain *d, unsigned long gpfn);
 
 /************************************************************************/
@@ -661,7 +661,7 @@
             // This isn't common -- it only happens during shadow mode setup
             // and mode changes.
             //
-            mfn = translate_gpfn_to_mfn(d, pfn);
+            mfn = gpfn_to_mfn_foreign(d, pfn);
         }
         else
             mfn = __gpfn_to_mfn(d, pfn);
diff -Nru a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
--- a/xen/include/xen/perfc_defn.h      2005-04-05 12:21:24 -04:00
+++ b/xen/include/xen/perfc_defn.h      2005-04-05 12:21:24 -04:00
@@ -98,7 +98,7 @@
 PERFCOUNTER_CPU(validate_hl2e_calls,               "calls to 
validate_hl2e_change")
 PERFCOUNTER_CPU(validate_hl2e_changes,             "validate_hl2e makes 
changes")
 PERFCOUNTER_CPU(exception_fixed,                   "pre-exception fixed")
-PERFCOUNTER_CPU(translate_gpfn_to_mfn,             "calls to 
translate_gpfn_to_mfn")
+PERFCOUNTER_CPU(gpfn_to_mfn_foreign,               "calls to 
gpfn_to_mfn_foreign")
 PERFCOUNTER_CPU(remove_write_access,               "calls to 
remove_write_access")
 PERFCOUNTER_CPU(remove_write_access_easy,          "easy outs of 
remove_write_access")
 PERFCOUNTER_CPU(remove_write_no_work,              "no work in 
remove_write_access")

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Rename translate_gpfn_to_mfn to gpfn_to_mfn_foreign., BitKeeper Bot <=