Make use of exclude_guest and exlude_host in perf-kvm to do only guest-only counting by default.
Signed-off-by: Joerg Roedel <[email protected]> --- tools/perf/builtin-kvm.c | 3 ++- tools/perf/util/event.c | 8 ++++++++ tools/perf/util/event.h | 2 ++ tools/perf/util/evlist.c | 5 ++++- tools/perf/util/parse-events.c | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 032324a..9b05afa 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -107,7 +107,8 @@ static int __cmd_buildid_list(int argc, const char **argv) int cmd_kvm(int argc, const char **argv, const char *prefix __used) { - perf_host = perf_guest = 0; + perf_host = 0; + perf_guest = 1; argc = parse_options(argc, argv, kvm_options, kvm_usage, PARSE_OPT_STOP_AT_NON_OPTION); diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 3c1b8a6..8262819 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -44,6 +44,14 @@ static struct perf_sample synth_sample = { .period = 1, }; +void event_attr_init(struct perf_event_attr *attr) +{ + if (!perf_host) + attr->exclude_host = 1; + if (!perf_guest) + attr->exclude_guest = 1; +} + static pid_t perf_event__synthesize_comm(union perf_event *event, pid_t pid, int full, perf_event__handler_t process, struct perf_session *session) diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 1d7f664..376f67e 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -150,6 +150,8 @@ typedef int (*perf_event__handler_t)(union perf_event *event, struct perf_sample *sample, struct perf_session *session); +void event_attr_init(struct perf_event_attr *attr); + int perf_event__synthesize_thread_map(struct thread_map *threads, perf_event__handler_t process, struct perf_session *session); diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index b021ea9..46d4ca7 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -82,8 +82,11 @@ int perf_evlist__add_default(struct perf_evlist *evlist) .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES, }; - struct perf_evsel *evsel = perf_evsel__new(&attr, 0); + struct perf_evsel *evsel; + + event_attr_init(&attr); + evsel = perf_evsel__new(&attr, 0); if (evsel == NULL) return -ENOMEM; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 8bfb8de..1c97b4b 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -842,6 +842,7 @@ int parse_events(const struct option *opt, const char *str, int unset __used) for (;;) { ostr = str; memset(&attr, 0, sizeof(attr)); + event_attr_init(&attr); ret = parse_event_symbols(opt, &str, &attr); if (ret == EVT_FAILED) return -1; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
