[PATCH for-4.5 v10 10/19] xen/mem_access: Abstract architecture specific sanity check

[Tamas K Lengyel <tklengyel@sec.in.tum.de>]

Signed-off-by: Tamas K Lengyel <tklengyel@sec.in.tum.de>
Acked-by: Tim Deegan <tim@xen.org>
---
v5: Style fix.
v4: Style fix.
v2: Move sanity check function into architecture specific p2m.h
---
 xen/common/mem_access.c   | 2 +-
 xen/include/asm-x86/p2m.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/xen/common/mem_access.c b/xen/common/mem_access.c
index 64e5301..6c2724b 100644
--- a/xen/common/mem_access.c
+++ b/xen/common/mem_access.c
@@ -70,7 +70,7 @@ int mem_access_memop(unsigned long cmd,
         return rc;
 
     rc = -EINVAL;
-    if ( !is_hvm_domain(d) )
+    if ( !p2m_mem_access_sanity_check(d) )
         goto out;
 
     rc = xsm_mem_event_op(XSM_DM_PRIV, d, XENMEM_access_op);
diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index f6136f9..90ddd15 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -598,6 +598,12 @@ static inline bool_t p2m_mem_event_sanity_check(struct domain *d)
     return hap_enabled(d) && cpu_has_vmx;
 }
 
+/* Sanity check for mem_access hardware support */
+static inline bool_t p2m_mem_access_sanity_check(struct domain *d)
+{
+    return is_hvm_domain(d);
+}
+
 /* 
  * Internal functions, only called by other p2m code
  */
-- 
2.1.0