| Message ID | 1462983171-4208-3-git-send-email-rkrcmar@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/05/2016 18:12, Radim Kr?má? wrote: > > if (!(cpuid_indexed(7, 0).c & (1 << X86_FEATURE_PKU))) { > printf("PKU not enabled, aborting\n"); > - abort(); > + return report_summary(); Needs report_skip? > } > > setup_vm(); > diff --git a/x86/pmu.c b/x86/pmu.c > index 03f80190bb25..c68980044dee 100644 > --- a/x86/pmu.c > +++ b/x86/pmu.c > @@ -387,7 +387,7 @@ int main(int ac, char **av) > > if (!eax.split.version_id) { > printf("No pmu is detected!\n"); > - return 1; > + return report_summary(); Needs report_skip? > } > printf("PMU version: %d\n", eax.split.version_id); > printf("GP counters: %d\n", eax.split.num_counters); > diff --git a/x86/smap.c b/x86/smap.c > index 69e71864dc9b..c9de081a474b 100644 > --- a/x86/smap.c > +++ b/x86/smap.c > @@ -93,7 +93,7 @@ int main(int ac, char **av) > > if (!(cpuid_indexed(7, 0).b & (1 << X86_FEATURE_SMAP))) { > printf("SMAP not enabled, aborting\n"); > - abort(); > + return report_summary(); Needs report_skip? > } > > setup_vm(); > diff --git a/x86/svm.c b/x86/svm.c > index 934b2ae91fa8..301cf8cb2d6b 100644 > --- a/x86/svm.c > +++ b/x86/svm.c > @@ -1064,7 +1064,7 @@ int main(int ac, char **av) > > if (!(cpuid(0x80000001).c & 4)) { > printf("SVM not availble\n"); > - return 0; > + return report_summary(); Needs report_skip? > } > > setup_svm(); > diff --git a/x86/tsc.c b/x86/tsc.c > index 6f89c911c2bc..62450e71725c 100644 > --- a/x86/tsc.c > +++ b/x86/tsc.c > @@ -43,5 +43,5 @@ int main() > test_rdtscp(0x100); > } else > printf("rdtscp not supported\n"); Needs report_skip? > - return 0; > + return report_summary(); Just sending a fixup patch is enough. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/x86/apic.c b/x86/apic.c index 61a0a7659805..8b08a950a0c7 100644 --- a/x86/apic.c +++ b/x86/apic.c @@ -27,7 +27,7 @@ static void tsc_deadline_timer_isr(isr_regs_t *regs) ++tdt_count; } -static void start_tsc_deadline_timer(void) +static void __test_tsc_deadline_timer(void) { handle_irq(TSC_DEADLINE_TIMER_VECTOR, tsc_deadline_timer_isr); irq_enable(); @@ -45,7 +45,6 @@ static int enable_tsc_deadline_timer(void) if (cpuid(1).c & (1 << 24)) { lvtt = TSC_DEADLINE_TIMER_MODE | TSC_DEADLINE_TIMER_VECTOR; apic_write(APIC_LVTT, lvtt); - start_tsc_deadline_timer(); return 1; } else { return 0; @@ -55,9 +54,9 @@ static int enable_tsc_deadline_timer(void) static void test_tsc_deadline_timer(void) { if(enable_tsc_deadline_timer()) { - printf("tsc deadline timer enabled\n"); + __test_tsc_deadline_timer(); } else { - printf("tsc deadline timer not detected\n"); + report_skip("tsc deadline timer not detected"); } } diff --git a/x86/emulator.c b/x86/emulator.c index 3730721258bc..8d262d832112 100644 --- a/x86/emulator.c +++ b/x86/emulator.c @@ -1082,7 +1082,7 @@ static void illegal_movbe_handler(struct ex_regs *regs) static void test_illegal_movbe(void) { if (!(cpuid(1).c & (1 << 22))) { - printf("SKIP: illegal movbe\n"); + report_skip("illegal movbe"); return; } diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c index 6e088944be1f..f5eb82bb7336 100644 --- a/x86/hyperv_synic.c +++ b/x86/hyperv_synic.c @@ -202,7 +202,7 @@ int main(int ac, char **av) report("Hyper-V SynIC test", ok); } else { - report("Hyper-V SynIC is not supported", true); + report_skip("Hyper-V SynIC is not supported"); } return report_summary(); diff --git a/x86/pku.c b/x86/pku.c index df51d1b59048..6214f0bc151f 100644 --- a/x86/pku.c +++ b/x86/pku.c @@ -68,7 +68,7 @@ int main(int ac, char **av) if (!(cpuid_indexed(7, 0).c & (1 << X86_FEATURE_PKU))) { printf("PKU not enabled, aborting\n"); - abort(); + return report_summary(); } setup_vm(); diff --git a/x86/pmu.c b/x86/pmu.c index 03f80190bb25..c68980044dee 100644 --- a/x86/pmu.c +++ b/x86/pmu.c @@ -387,7 +387,7 @@ int main(int ac, char **av) if (!eax.split.version_id) { printf("No pmu is detected!\n"); - return 1; + return report_summary(); } printf("PMU version: %d\n", eax.split.version_id); printf("GP counters: %d\n", eax.split.num_counters); diff --git a/x86/smap.c b/x86/smap.c index 69e71864dc9b..c9de081a474b 100644 --- a/x86/smap.c +++ b/x86/smap.c @@ -93,7 +93,7 @@ int main(int ac, char **av) if (!(cpuid_indexed(7, 0).b & (1 << X86_FEATURE_SMAP))) { printf("SMAP not enabled, aborting\n"); - abort(); + return report_summary(); } setup_vm(); diff --git a/x86/svm.c b/x86/svm.c index 934b2ae91fa8..301cf8cb2d6b 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -1064,7 +1064,7 @@ int main(int ac, char **av) if (!(cpuid(0x80000001).c & 4)) { printf("SVM not availble\n"); - return 0; + return report_summary(); } setup_svm(); diff --git a/x86/tsc.c b/x86/tsc.c index 6f89c911c2bc..62450e71725c 100644 --- a/x86/tsc.c +++ b/x86/tsc.c @@ -43,5 +43,5 @@ int main() test_rdtscp(0x100); } else printf("rdtscp not supported\n"); - return 0; + return report_summary(); }
No care to consistency or exhaustivity was given. Drew pointed out that tscdeadline_latency.c doesn't report skipped tests. tscdeadline_latency needs complete refactoring and is not run with ./run_tests, so I ignored it. Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> --- v4: explained the reason behind ignoring v3 review x86/apic.c | 7 +++---- x86/emulator.c | 2 +- x86/hyperv_synic.c | 2 +- x86/pku.c | 2 +- x86/pmu.c | 2 +- x86/smap.c | 2 +- x86/svm.c | 2 +- x86/tsc.c | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-)