From fb25216760a0c17447faa1f416cc59341600dc1b Mon Sep 17 00:00:00 2001 From: Elena Ufimtseva Date: Wed, 23 Sep 2015 11:47:49 -0400 Subject: [PATCH] RMRR regression debug for PVH Dom0 Signed-off-by: Elena Ufimtseva --- xen/arch/x86/mm/p2m.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b2726bd..16c8938 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -970,8 +970,10 @@ int set_identity_p2m_entry(struct domain *d, unsigned long gfn, if ( p2mt == p2m_invalid || p2mt == p2m_mmio_dm ) ret = p2m_set_entry(p2m, gfn, _mfn(gfn), PAGE_ORDER_4K, p2m_mmio_direct, p2ma); - else if ( mfn_x(mfn) == gfn && p2mt == p2m_mmio_direct && a == p2ma ) - ret = 0; + else if ( mfn_x(mfn) == gfn && p2mt == p2m_mmio_direct ) + if ( a == p2ma && !is_pvh_domain(d) ) + ret = 0; + else ret = iommu_map_page(d, gfn, gfn, IOMMUF_readable|IOMMUF_writable); else { if ( flag & XEN_DOMCTL_DEV_RDM_RELAXED ) -- 2.1.4