Mailing List Archive

commit b7dd0f590aa69431f26f825ae3d568623ee7fe54
Author: Demi Marie Obenour <demi@invisiblethingslab.com>
AuthorDate: Tue Dec 20 16:51:18 2022 +0100
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Tue Dec 20 16:51:18 2022 +0100

x86: replace EPT_EMT_* constants with X86_MT_*

This allows eliminating the former. No functional change intended.

Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
xen/arch/x86/include/asm/hvm/vmx/vmx.h | 9 ---------
xen/arch/x86/mm/hap/nested_ept.c | 4 ++--
2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
index 8e1e42ac47..96a9f07ca5 100644
--- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
+++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
@@ -80,15 +80,6 @@ typedef enum {
#define EPTE_RWX_MASK 0x7
#define EPTE_FLAG_MASK 0x7f

-#define EPT_EMT_UC 0
-#define EPT_EMT_WC 1
-#define EPT_EMT_RSV0 2
-#define EPT_EMT_RSV1 3
-#define EPT_EMT_WT 4
-#define EPT_EMT_WP 5
-#define EPT_EMT_WB 6
-#define EPT_EMT_RSV2 7
-
#define PI_xAPIC_NDST_MASK 0xFF00

void vmx_asm_vmexit_handler(struct cpu_user_regs);
diff --git a/xen/arch/x86/mm/hap/nested_ept.c b/xen/arch/x86/mm/hap/nested_ept.c
index 1cb7fefc37..23fb3889b7 100644
--- a/xen/arch/x86/mm/hap/nested_ept.c
+++ b/xen/arch/x86/mm/hap/nested_ept.c
@@ -84,8 +84,8 @@ static bool_t nept_emt_bits_check(ept_entry_t e, uint32_t level)
{
if ( e.sp || level == 1 )
{
- if ( e.emt == EPT_EMT_RSV0 || e.emt == EPT_EMT_RSV1 ||
- e.emt == EPT_EMT_RSV2 )
+ if ( e.emt == X86_MT_RSVD_2 || e.emt == X86_MT_RSVD_3 ||
+ e.emt == X86_MT_UCM )
return 1;
}
return 0;
--
generated by git-patchbot for /home/xen/git/xen.git#master