x86: fix l1_disallow_mask() for HVM guests with pass-thru devices.

Signed-off-by: Naoki Nishiguchi <nisiguti@jp.fujitsu.com>

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index c6855d76d663677c54eb50f9bba0b46d6cf3e3de..150d987514fa0ad6ed1336a47e66d6bf10421580 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -163,7 +163,8 @@ unsigned long total_pages;
 #define l1_disallow_mask(d)                                     \
     ((d != dom_io) &&                                           \
      (rangeset_is_empty((d)->iomem_caps) &&                     \
-      rangeset_is_empty((d)->arch.ioport_caps)) ?               \
+      rangeset_is_empty((d)->arch.ioport_caps) &&               \
+      !has_arch_pdevs(d)) ?                                     \
      L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS))
 
 #ifdef CONFIG_COMPAT