This is to make it easier to see which parts of p2m.c still aren't HVM-
specific: In one case the conditionals sat in an already guarded region,
while in the other case P2M_AUDIT implies HVM.
Signed-off-by: Jan Beulich <jbeul...@suse.com>
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1584,11 +1584,10 @@ p2m_flush_table_locked(struct p2m_domain
* when discarding them.
*/
ASSERT(!p2m_is_hostp2m(p2m));
-#ifdef CONFIG_HVM
- /* Nested p2m's do not do pod, hence the asserts (and no pod lock)*/
+
+ /* Nested p2m's do not do pod, hence the asserts (and no pod lock) */
ASSERT(page_list_empty(&p2m->pod.super));
ASSERT(page_list_empty(&p2m->pod.single));
-#endif
/* No need to flush if it's already empty */
if ( p2m_is_nestedp2m(p2m) && p2m->np2m_base == P2M_BASE_EADDR )
@@ -2497,7 +2496,6 @@ int p2m_altp2m_propagate_change(struct d
return ret;
}
-#endif /* CONFIG_HVM */
/*** Audit ***/
@@ -2603,8 +2601,6 @@ out_p2m_audit:
}
#endif /* P2M_AUDIT */
-#ifdef CONFIG_HVM
-
/*
* Add frame from foreign domain to target domain's physmap. Similar to
* XENMAPSPACE_gmfn but the frame is foreign being mapped into current,
