On 9/28/15 7:00 AM, Alexander Yarygin wrote:
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index fc1cffb..ef25fcf 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -31,20 +31,18 @@ #include <math.h> #ifdef HAVE_KVM_STAT_SUPPORT -#include <asm/kvm_perf.h> #include "util/kvm-stat.h" -void exit_event_get_key(struct perf_evsel *evsel, - struct perf_sample *sample, +void exit_event_get_key(struct perf_evsel *evsel, struct perf_sample *sample, struct event_key *key) { key->info = 0; - key->key = perf_evsel__intval(evsel, sample, KVM_EXIT_REASON); + key->key = perf_evsel__intval(evsel, sample, exit_reason_code); } bool kvm_exit_event(struct perf_evsel *evsel) { - return !strcmp(evsel->name, KVM_EXIT_TRACE); + return !strncmp(evsel->name, kvm_events_tp[1], strlen(evsel->name)); }Hmm, direct access to kvm_events_tp? Maybe add a getter for this or something like extern char *kvm_exit_trace;? /* why strncmp? */bool exit_event_begin(struct perf_evsel *evsel, @@ -60,7 +58,7 @@ bool exit_event_begin(struct perf_evsel *evsel, bool kvm_entry_event(struct perf_evsel *evsel) { - return !strcmp(evsel->name, KVM_ENTRY_TRACE); + return !strncmp(evsel->name, kvm_events_tp[0], strlen(evsel->name)); } bool exit_event_end(struct perf_evsel *evsel,
I agree; don't rely on kvm_events_tp. Define KVM_ENTRY_TRACE and KVM_EXIT_TRACE like x86.
-- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
