report_skip() prints message with "SKIP:" prefix to explictly
tell which test is skipped, making the report screening easier.
Suggested-by: Sean Christopherson <seanjc@xxxxxxxxxx>
Signed-off-by: Yang Weijiang <weijiang.yang@xxxxxxxxx>
---
x86/vmx_tests.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 4d581e7..27ab5ed 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -4107,7 +4107,7 @@ static void test_vpid(void)
int i;
if (!is_vpid_supported()) {
- printf("Secondary controls and/or VPID not supported\n");
+ report_skip("Secondary controls and/or VPID not supported\n");
return;
}
@@ -4614,7 +4614,7 @@ static void test_nmi_ctrls(void)
if ((ctrl_pin_rev.clr & (PIN_NMI | PIN_VIRT_NMI)) !=
(PIN_NMI | PIN_VIRT_NMI)) {
- printf("NMI exiting and Virtual NMIs are not supported !\n");
+ report_skip("NMI exiting and Virtual NMIs are not supported !\n");
return;
}
@@ -4724,7 +4724,7 @@ static void test_ept_eptp(void)
if (!((ctrl_cpu_rev[0].clr & CPU_SECONDARY) &&
(ctrl_cpu_rev[1].clr & CPU_EPT))) {
- printf("\"CPU secondary\" and/or \"enable EPT\" execution controls are not supported !\n");
+ report_skip("\"CPU secondary\" and/or \"enable EPT\" execution controls are not supported !\n");
return;
}
@@ -4884,7 +4884,7 @@ static void test_pml(void)
if (!((ctrl_cpu_rev[0].clr & CPU_SECONDARY) &&
(ctrl_cpu_rev[1].clr & CPU_EPT) && (ctrl_cpu_rev[1].clr & CPU_PML))) {
- printf("\"Secondary execution\" control or \"enable EPT\" control or \"enable PML\" control is not supported !\n");
+ report_skip("\"Secondary execution\" control or \"enable EPT\" control or \"enable PML\" control is not supported !\n");
return;
}
@@ -4936,7 +4936,7 @@ static void test_vmx_preemption_timer(void)
if (!((ctrl_exit_rev.clr & EXI_SAVE_PREEMPT) ||
(ctrl_pin_rev.clr & PIN_PREEMPT))) {
- printf("\"Save-VMX-preemption-timer\" control and/or \"Enable-VMX-preemption-timer\" control is not supported\n");
+ report_skip("\"Save-VMX-preemption-timer\" control and/or \"Enable-VMX-preemption-timer\" control is not supported\n");
return;
}
@@ -5060,7 +5060,7 @@ static void vmx_mtf_test(void)
handler old_gp, old_db;
if (!(ctrl_cpu_rev[0].clr & CPU_MTF)) {
- printf("CPU does not support the 'monitor trap flag' processor-based VM-execution control.\n");
+ report_skip("CPU does not support the 'monitor trap flag' processor-based VM-execution control.\n");
return;
}
@@ -5163,12 +5163,12 @@ static void vmx_mtf_pdpte_test(void)
return;
if (!(ctrl_cpu_rev[0].clr & CPU_MTF)) {
- printf("CPU does not support 'monitor trap flag.'\n");
+ report_skip("CPU does not support 'monitor trap flag.'\n");
return;
}
if (!(ctrl_cpu_rev[1].clr & CPU_URG)) {
- printf("CPU does not support 'unrestricted guest.'\n");
+ report_skip("CPU does not support 'unrestricted guest.'\n");
return;
}
@@ -7175,7 +7175,7 @@ static void test_efer(u32 fld, const char * fld_name, u32 ctrl_fld,
efer_reserved_bits &= ~EFER_NX;
if (!ctrl_bit1) {
- printf("\"Load-IA32-EFER\" exit control not supported\n");
+ report_skip("\"Load-IA32-EFER\" exit control not supported\n");
goto test_entry_exit_mode;
}
@@ -7258,7 +7258,7 @@ static void test_host_efer(void)
static void test_guest_efer(void)
{
if (!(ctrl_enter_rev.clr & ENT_LOAD_EFER)) {
- printf("\"Load-IA32-EFER\" entry control not supported\n");
+ report_skip("\"Load-IA32-EFER\" entry control not supported\n");
return;
}
@@ -7349,7 +7349,7 @@ static void test_load_host_pat(void)
* "load IA32_PAT" VM-exit control
*/
if (!(ctrl_exit_rev.clr & EXI_LOAD_PAT)) {
- printf("\"Load-IA32-PAT\" exit control not supported\n");
+ report_skip("\"Load-IA32-PAT\" exit control not supported\n");
return;
}
@@ -7491,7 +7491,7 @@ static void test_perf_global_ctrl(u32 nr, const char *name, u32 ctrl_nr,
static void test_load_host_perf_global_ctrl(void)
{
if (!(ctrl_exit_rev.clr & EXI_LOAD_PERF)) {
- printf("\"load IA32_PERF_GLOBAL_CTRL\" exit control not supported\n");
+ report_skip("\"load IA32_PERF_GLOBAL_CTRL\" exit control not supported\n");
return;
}
@@ -7503,7 +7503,7 @@ static void test_load_host_perf_global_ctrl(void)
static void test_load_guest_perf_global_ctrl(void)
{
if (!(ctrl_enter_rev.clr & ENT_LOAD_PERF)) {
- printf("\"load IA32_PERF_GLOBAL_CTRL\" entry control not supported\n");
+ report_skip("\"load IA32_PERF_GLOBAL_CTRL\" entry control not supported\n");
return;
}
@@ -7809,7 +7809,7 @@ static void test_load_guest_pat(void)
* "load IA32_PAT" VM-entry control
*/
if (!(ctrl_enter_rev.clr & ENT_LOAD_PAT)) {
- printf("\"Load-IA32-PAT\" entry control not supported\n");
+ report_skip("\"Load-IA32-PAT\" entry control not supported\n");
return;
}
@@ -7833,7 +7833,7 @@ static void test_load_guest_bndcfgs(void)
u64 bndcfgs;
if (!(ctrl_enter_rev.clr & ENT_LOAD_BNDCFGS)) {
- printf("\"Load-IA32-BNDCFGS\" entry control not supported\n");
+ report_skip("\"Load-IA32-BNDCFGS\" entry control not supported\n");
return;
}
@@ -9970,7 +9970,7 @@ static void sipi_test_ap_thread(void *data)
static void vmx_sipi_signal_test(void)
{
if (!(rdmsr(MSR_IA32_VMX_MISC) & MSR_IA32_VMX_MISC_ACTIVITY_WAIT_SIPI)) {
- printf("\tACTIVITY_WAIT_SIPI state is not supported.\n");
+ report_skip("\tACTIVITY_WAIT_SIPI state is not supported.\n");
return;
}
@@ -10271,18 +10271,18 @@ static void vmx_vmcs_shadow_test(void)
struct vmcs *shadow;
if (!(ctrl_cpu_rev[0].clr & CPU_SECONDARY)) {
- printf("\t'Activate secondary controls' not supported.\n");
+ report_skip("\t'Activate secondary controls' not supported.\n");
return;
}
if (!(ctrl_cpu_rev[1].clr & CPU_SHADOW_VMCS)) {
- printf("\t'VMCS shadowing' not supported.\n");
+ report_skip("\t'VMCS shadowing' not supported.\n");
return;
}
if (!(rdmsr(MSR_IA32_VMX_MISC) &
MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS)) {
- printf("\tVMWRITE can't modify VM-exit information fields.\n");
+ report_skip("\tVMWRITE can't modify VM-exit information fields.\n");
return;
}
base-commit: ca85dda2671e88d34acfbca6de48a9ab32b1810d
--
2.31.1
