From: Peter Feiner <pfeiner@xxxxxxxxxx>
Signed-off-by: Peter Feiner <pfeiner@xxxxxxxxxx>
Signed-off-by: David Matlack <dmatlack@xxxxxxxxxx>
---
x86/unittests.cfg | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
x86/vmx_tests.c | 4 +--
2 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/x86/unittests.cfg b/x86/unittests.cfg
index 54138388fd5d..a267638733aa 100644
--- a/x86/unittests.cfg
+++ b/x86/unittests.cfg
@@ -198,6 +198,91 @@ arch = x86_64
file = vmx.flat
extra_params = -cpu host,+vmx
arch = x86_64
+groups = vmx
+
+[vmx_vmenter]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append vmenter
+arch = x86_64
+groups = vmx
+
+[vmx_preemption_timer]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append preemption_timer
+arch = x86_64
+groups = vmx
+
+[vmx_control_field_PAT]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append control_field_PAT
+arch = x86_64
+groups = vmx
+
+[vmx_control_field_EFER]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append control_field_EFER
+arch = x86_64
+groups = vmx
+
+[vmx_CR_shadowing]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append CR_shadowing
+arch = x86_64
+groups = vmx
+
+[vmx_IO_bitmap]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append I/O_bitmap
+arch = x86_64
+groups = vmx
+
+[vmx_instruction_intercept]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append instruction_intercept
+arch = x86_64
+groups = vmx
+
+[vmx_EPT_AD_enabled]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append EPT_A/D_enabled
+arch = x86_64
+groups = vmx
+
+[vmx_EPT_AD_disabled]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append EPT_A/D_disabled
+arch = x86_64
+groups = vmx
+
+[vmx_VPID]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append VPID
+arch = x86_64
+groups = vmx
+
+[vmx_interrupt]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append interrupt
+arch = x86_64
+groups = vmx
+
+[vmx_debug_controls]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append debug_controls
+arch = x86_64
+groups = vmx
+
+[vmx_MSR_switch]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append MSR_switch
+arch = x86_64
+groups = vmx
+
+[vmx_vmmcall]
+file = vmx.flat
+extra_params = -cpu host,+vmx -append vmmcall
+arch = x86_64
+groups = vmx
[debug]
file = debug.flat
diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index b9115637915c..cd18b133a3a3 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -1900,8 +1900,8 @@ struct vmx_test vmx_tests[] = {
NULL, {0} },
{ "instruction intercept", insn_intercept_init, insn_intercept_main,
insn_intercept_exit_handler, NULL, {0} },
- { "EPT, A/D disabled", ept_init, ept_main, ept_exit_handler, NULL, {0} },
- { "EPT, A/D enabled", eptad_init, eptad_main, eptad_exit_handler, NULL, {0} },
+ { "EPT A/D disabled", ept_init, ept_main, ept_exit_handler, NULL, {0} },
+ { "EPT A/D enabled", eptad_init, eptad_main, eptad_exit_handler, NULL, {0} },
{ "VPID", vpid_init, vpid_main, vpid_exit_handler, NULL, {0} },
{ "interrupt", interrupt_init, interrupt_main,
interrupt_exit_handler, NULL, {0} },
--
2.12.2.816.g2cccc81164-goog
