[Xen-changelog] [xen-unstable] Revert 20194:582970a2d2dc

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1253258813 -3600
# Node ID d2b76e218c28d01ab2bf63aea8c3a5ce9804c802
# Parent  72d130772f36284b904da2369410de795237f712
Revert 20194:582970a2d2dc

Excessively slows down domain creation in debug builds.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/mm/p2m.c |   30 ------------------------------
 1 files changed, 30 deletions(-)

diff -r 72d130772f36 -r d2b76e218c28 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Wed Sep 16 09:30:41 2009 +0100
+++ b/xen/arch/x86/mm/p2m.c     Fri Sep 18 08:26:53 2009 +0100
@@ -1473,36 +1473,6 @@ int set_p2m_entry(struct domain *d, unsi
                 9 : 0;
         else
             order = 0;
-
-#ifndef NDEBUG
-        /* PoD code assumes that a page owned by the domain, not from the 
xenheap, and in the p2m
-         * is on the domain page list.  Verify this assumption. */
-        if ( mfn_valid(mfn)
-             && p2m_is_ram(p2mt)
-             && page_get_owner(mfn_to_page(mfn))==d
-             && ( (mfn_to_page(mfn)->count_info & PGC_xen_heap) == 0 ) )
-        {
-            struct page_info *p, *q;
-
-            p = mfn_to_page(mfn);
-
-            spin_lock(&d->page_alloc_lock);
-           
-            /* Walk the domain page list and make sure this page is on it... */
-            for ( q = page_list_first(&d->page_list) ; q; q = 
page_list_next(q, &d->page_list) )
-                if ( q == p )
-                    break;
-            if ( !q )
-            {
-                printk("%s: mfn %lx owned by d%d, not xen_heap, but not on 
domain page_list!\n",
-                       __func__, mfn_x(mfn), d->domain_id);
-                BUG();
-            }   
-
-            spin_unlock(&d->page_alloc_lock);
-        }
-#endif
-
         rc = d->arch.p2m->set_entry(d, gfn, mfn, order, p2mt);
         gfn += 1ul << order;
         if ( mfn_x(mfn) != INVALID_MFN )

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