Make the PMU testcases dependent on KVM actually enabling a vPMU. Opportunistically fix the pmu_lbrs testcase to separate requirements by whitespace, not by adding additional "check" entries. Reported-by: Like Xu <like.xu.linux@xxxxxxxxx> Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx> --- x86/unittests.cfg | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/x86/unittests.cfg b/x86/unittests.cfg index f4e7b254..3fe59449 100644 --- a/x86/unittests.cfg +++ b/x86/unittests.cfg @@ -206,7 +206,7 @@ extra_params = -cpu max,vendor=GenuineIntel [pmu] file = pmu.flat extra_params = -cpu max -check = /proc/sys/kernel/nmi_watchdog=0 +check = /sys/module/kvm/parameters/enable_pmu=Y /proc/sys/kernel/nmi_watchdog=0 accel = kvm groups = pmu @@ -214,8 +214,7 @@ groups = pmu arch = x86_64 file = pmu_lbr.flat extra_params = -cpu host,migratable=no -check = /sys/module/kvm/parameters/ignore_msrs=N -check = /proc/sys/kernel/nmi_watchdog=0 +check = /sys/module/kvm/parameters/enable_pmu=Y /proc/sys/kernel/nmi_watchdog=0 /sys/module/kvm/parameters/ignore_msrs=N accel = kvm groups = pmu @@ -223,7 +222,7 @@ groups = pmu arch = x86_64 file = pmu_pebs.flat extra_params = -cpu host,migratable=no -check = /proc/sys/kernel/nmi_watchdog=0 +check = /sys/module/kvm/parameters/enable_pmu=Y /proc/sys/kernel/nmi_watchdog=0 accel = kvm groups = pmu -- 2.41.0.162.gfafddb0af9-goog
