[Xen-changelog] [xen-unstable] x86 p2m: use common p2m ops in common p2m code path

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1249662191 -3600
# Node ID 3e8576d2b5d4f8576b9aa90d82c11c61fc387b90
# Parent  f3aaaf764bb83aa6058994ed162d87e16151b241
x86 p2m: use common p2m ops in common p2m code path

We found recently there was an assertion failure when EPT mode is
enabled on 32PAE host when debug=y is used. The patch attached fixes
that. It uses the common p2m ops in the
common p2m code path p2m_remove_page rather than calling
p2m_gfn_to_mfn() for only shadow mode.

Signed-off-by: Xin, Xiaohui <xiaohui.xin@xxxxxxxxx>
---
 xen/arch/x86/mm/p2m.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r f3aaaf764bb8 -r 3e8576d2b5d4 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Fri Aug 07 17:22:04 2009 +0100
+++ b/xen/arch/x86/mm/p2m.c     Fri Aug 07 17:23:11 2009 +0100
@@ -1882,7 +1882,7 @@ p2m_remove_page(struct domain *d, unsign
 
     for ( i = 0; i < (1UL << page_order); i++ )
     {
-        mfn_return = p2m_gfn_to_mfn(d, gfn + i, &t, p2m_query);
+        mfn_return = d->arch.p2m->get_entry(d, gfn + i, &t, p2m_query);
         if ( !p2m_is_grant(t) )
             set_gpfn_from_mfn(mfn+i, INVALID_M2P_ENTRY);
         ASSERT( !p2m_is_valid(t) || mfn + i == mfn_x(mfn_return) );

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