On 07/12/2018 09:09 AM, Thomas Richter wrote:
> With commit eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> s390 platform provides detailed type/model/capacitiy information
> in the CPU indentifier string instead of just "IBM/S390".
>
> This breaks perf kvm support which uses hard coded string IBM/S390 to
> compare with the CPU identifier string. Fix this by changing the comparison.
>
> Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
> Cc: Stefan Raspl <raspl@xxxxxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # 4.17
>
> Signed-off-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
> Reviewed-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxx>
Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
> ---
> tools/perf/arch/s390/util/kvm-stat.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/arch/s390/util/kvm-stat.c b/tools/perf/arch/s390/util/kvm-stat.c
> index d233e2eb9592..aaabab5e2830 100644
> --- a/tools/perf/arch/s390/util/kvm-stat.c
> +++ b/tools/perf/arch/s390/util/kvm-stat.c
> @@ -102,7 +102,7 @@ const char * const kvm_skip_events[] = {
>
> int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)
> {
> - if (strstr(cpuid, "IBM/S390")) {
> + if (strstr(cpuid, "IBM")) {
> kvm->exit_reasons = sie_exit_reasons;
> kvm->exit_reasons_isa = "SIE";
> } else
>
