clean up the definition of hap_enabled().
Actually when hvm_domain.hap_enabled is true, it is already a hvm domain.
Signed-off-by: Xin Li <xin.li@intel.com>
diff -r 06c384172152 xen/arch/x86/mm/hap/p2m-ept.c
--- a/xen/arch/x86/mm/hap/p2m-ept.c Fri Jun 11 17:47:49 2010 +0100
+++ b/xen/arch/x86/mm/hap/p2m-ept.c Mon Jun 14 08:31:35 2010 +0800
@@ -704,7 +704,7 @@
for_each_domain(d)
{
- if ( !(is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled) )
+ if ( !hap_enabled(d) )
continue;
p2m = p2m_get_hostp2m(d);
diff -r 06c384172152 xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c Fri Jun 11 17:47:49 2010 +0100
+++ b/xen/arch/x86/mm/mem_sharing.c Mon Jun 14 08:31:35 2010 +0800
@@ -32,7 +32,7 @@
#include <xen/sched.h>
/* Auditing of memory sharing code? */
-#define MEM_SHARING_AUDIT 0
+#define MEM_SHARING_AUDIT 0
#if MEM_SHARING_AUDIT
static void mem_sharing_audit(void);
@@ -42,12 +42,9 @@
# define mem_sharing_audit() do {} while(0)
#endif /* MEM_SHARING_AUDIT */
-
-#define hap_enabled(d) \
- (is_hvm_domain(d) && paging_mode_hap(d))
#define mem_sharing_enabled(d) \
(is_hvm_domain(d) && (d)->arch.hvm_domain.mem_sharing_enabled)
-
+
#undef mfn_to_page
#define mfn_to_page(_m) __mfn_to_page(mfn_x(_m))
#undef mfn_valid
diff -r 06c384172152 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c Fri Jun 11 17:47:49 2010 +0100
+++ b/xen/arch/x86/mm/p2m.c Mon Jun 14 08:31:35 2010 +0800
@@ -1729,8 +1729,7 @@
p2m->get_entry_current = p2m_gfn_to_mfn_current;
p2m->change_entry_type_global = p2m_change_type_global;
- if ( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled
&&
- (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) )
+ if ( hap_enabled(d) && (boot_cpu_data.x86_vendor ==
X86_VENDOR_INTEL) )
ept_p2m_init(d);
return 0;
diff -r 06c384172152 xen/arch/x86/mm/paging.c
--- a/xen/arch/x86/mm/paging.c Fri Jun 11 17:47:49 2010 +0100
+++ b/xen/arch/x86/mm/paging.c Mon Jun 14 08:31:35 2010 +0800
@@ -29,8 +29,6 @@
#include <xen/numa.h>
#include <xsm/xsm.h>
-#define hap_enabled(d) (is_hvm_domain(d) &&
(d)->arch.hvm_domain.hap_enabled)
-
/* Printouts */
#define PAGING_PRINTK(_f, _a...) \
debugtrace_printk("pg: %s(): " _f, __func__, ##_a)
diff -r 06c384172152 xen/include/asm-x86/hvm/domain.h
--- a/xen/include/asm-x86/hvm/domain.h Fri Jun 11 17:47:49 2010 +0100
+++ b/xen/include/asm-x86/hvm/domain.h Mon Jun 14 08:31:35 2010 +0800
@@ -98,5 +98,7 @@
};
};
+#define hap_enabled(d) ((d)->arch.hvm_domain.hap_enabled)
+
#endif /* __ASM_X86_HVM_DOMAIN_H__ */
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel