[Xen-changelog] [xen-unstable] p2m: Fix debug build.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1253004368 -3600
# Node ID 515f333a1b3c04275b72472524e2b8a054ce1bd8
# Parent  aeec94b1ed59f0df93c9aee08dedaef5e02ae1f9
p2m: Fix debug build.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/mm/hap/p2m-ept.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff -r aeec94b1ed59 -r 515f333a1b3c xen/arch/x86/mm/hap/p2m-ept.c
--- a/xen/arch/x86/mm/hap/p2m-ept.c     Tue Sep 15 09:26:52 2009 +0100
+++ b/xen/arch/x86/mm/hap/p2m-ept.c     Tue Sep 15 09:46:08 2009 +0100
@@ -521,6 +521,7 @@ void ept_change_entry_emt_with_range(str
 {
     unsigned long gfn;
     ept_entry_t e;
+    mfn_t mfn;
     int order = 0;
 
     for ( gfn = start_gfn; gfn <= end_gfn; gfn++ )
@@ -530,6 +531,7 @@ void ept_change_entry_emt_with_range(str
             continue;
 
         order = 0;
+        mfn = _mfn(e.mfn);
 
         if ( e.sp_avail )
         {
@@ -541,22 +543,22 @@ void ept_change_entry_emt_with_range(str
                  * Set emt for super page.
                  */
                 order = EPT_TABLE_ORDER;
-                if ( need_modify_ept_entry(d, gfn, e.mfn, e.igmt, e.emt, 
e.avail1) )
-                    ept_set_entry(d, gfn, e.mfn, order, e.avail1);
+                if ( need_modify_ept_entry(d, gfn, mfn, e.igmt, e.emt, 
e.avail1) )
+                    ept_set_entry(d, gfn, mfn, order, e.avail1);
                 gfn += 0x1FF;
             }
             else
             {
                 /* Change emt for partial entries of the 2m area. */
-                if ( need_modify_ept_entry(d, gfn, e.mfn, e.igmt, e.emt, 
e.avail1) )
-                    ept_set_entry(d, gfn, e.mfn, order, e.avail1);
+                if ( need_modify_ept_entry(d, gfn, mfn, e.igmt, e.emt, 
e.avail1) )
+                    ept_set_entry(d, gfn, mfn, order, e.avail1);
                 gfn = ((gfn >> EPT_TABLE_ORDER) << EPT_TABLE_ORDER) + 0x1FF;
             }
         }
         else /* gfn assigned with 4k */
         {
-            if ( need_modify_ept_entry(d, gfn, e.mfn, e.igmt, e.emt, e.avail1) 
)
-                ept_set_entry(d, gfn, e.mfn, order, e.avail1);
+            if ( need_modify_ept_entry(d, gfn, mfn, e.igmt, e.emt, e.avail1) )
+                ept_set_entry(d, gfn, mfn, order, e.avail1);
         }
     }
 }

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