The VPID tests take quite a long time (about 12 minutes overall), so separate them from vmx_pf_exception_test and do not run vmx_pf_invvpid_test twice. Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> --- x86/unittests.cfg | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/x86/unittests.cfg b/x86/unittests.cfg index f0727f1..5367013 100644 --- a/x86/unittests.cfg +++ b/x86/unittests.cfg @@ -293,7 +293,7 @@ arch = i386 [vmx] file = vmx.flat -extra_params = -cpu max,+vmx -append "-exit_monitor_from_l2_test -ept_access* -vmx_smp* -vmx_vmcs_shadow_test -atomic_switch_overflow_msrs_test -vmx_init_signal_test -vmx_apic_passthrough_tpr_threshold_test -apic_reg_virt_test -virt_x2apic_mode_test -vmx_pf_exception_test -vmx_pf_no_vpid_test -vmx_pf_vpid_test" +extra_params = -cpu max,+vmx -append "-exit_monitor_from_l2_test -ept_access* -vmx_smp* -vmx_vmcs_shadow_test -atomic_switch_overflow_msrs_test -vmx_init_signal_test -vmx_apic_passthrough_tpr_threshold_test -apic_reg_virt_test -virt_x2apic_mode_test -vmx_pf_exception_test -vmx_pf_no_vpid_test -vmx_pf_invvpid_test -vmx_pf_vpid_test" arch = x86_64 groups = vmx @@ -362,10 +362,31 @@ groups = vmx [vmx_pf_exception_test] file = vmx.flat -extra_params = -cpu max,+vmx -append "vmx_pf_exception_test vmx_pf_no_vpid_test vmx_pf_vpid_test vmx_pf_invvpid_test" +extra_params = -cpu max,+vmx -append "vmx_pf_exception_test" arch = x86_64 groups = vmx nested_exception +[vmx_pf_vpid_test] +file = vmx.flat +extra_params = -cpu max,+vmx -append "vmx_pf_vpid_test" +arch = x86_64 +groups = vmx nested_exception +timeout = 240 + +[vmx_pf_invvpid_test] +file = vmx.flat +extra_params = -cpu max,+vmx -append "vmx_pf_invvpid_test" +arch = x86_64 +groups = vmx nested_exception +timeout = 240 + +[vmx_pf_no_vpid_test] +file = vmx.flat +extra_params = -cpu max,+vmx -append "vmx_pf_no_vpid_test" +arch = x86_64 +groups = vmx nested_exception +timeout = 240 + [vmx_pf_exception_test_reduced_maxphyaddr] file = vmx.flat extra_params = -cpu IvyBridge,phys-bits=36,host-phys-bits=off,+vmx -append "vmx_pf_exception_test vmx_pf_no_vpid_test vmx_pf_vpid_test vmx_pf_invvpid_test" -- 2.31.1
