diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-02 11:48:16 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-02 11:48:16 +0300 |
| commit | b9df84fd7c05cc300d6d14f022b8a00773ebcf8c (patch) | |
| tree | b7a3346416c6d1229ff79ade4fe8646c95125dd8 /tools/perf/builtin-kvm.c | |
| parent | 93472aff802fd7b61f2209335207e9bd793012f7 (diff) | |
| parent | 5ef7bbb09f7b91ef06524c72e1ab1fc48e0d6682 (diff) | |
| download | linux-b9df84fd7c05cc300d6d14f022b8a00773ebcf8c.tar.xz | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core fixes from Arnaldo Carvalho de Melo:
Build fixes:
- Create config.detected into OUTPUT directory, fixing parallel
builds sharing the same source directory (Aaro Kiskinen)
- Allow to specify custom linker command, fixing some MIPS64
builds. (Aaro Kiskinen)
Infrastructure fixes:
- Add missing break for PERF_RECORD_ITRACE_START, which caused those events
samples to be parsed as well as PERF_RECORD_LOST_SAMPLES. ITRACE_START only
appears when Intel PT or BTS are present, so (Jiri Olsa)
- Call the perf_session destructor when bailing out in the inject, kmem, report,
kvm and mem tools (Taeung Song)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-kvm.c')
| -rw-r--r-- | tools/perf/builtin-kvm.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 74878cd75078..fc1cffb1b7a2 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm) symbol__init(&kvm->session->header.env); - if (!perf_session__has_traces(kvm->session, "kvm record")) - return -EINVAL; + if (!perf_session__has_traces(kvm->session, "kvm record")) { + ret = -EINVAL; + goto out_delete; + } /* * Do not use 'isa' recorded in kvm_exit tracepoint since it is not @@ -1070,9 +1072,13 @@ static int read_events(struct perf_kvm_stat *kvm) */ ret = cpu_isa_config(kvm); if (ret < 0) - return ret; + goto out_delete; - return perf_session__process_events(kvm->session); + ret = perf_session__process_events(kvm->session); + +out_delete: + perf_session__delete(kvm->session); + return ret; } static int parse_target_str(struct perf_kvm_stat *kvm) |