Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes

[cascardo/linux.git] / tools / perf / builtin-kvm.c

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 6487c06..f4efef9 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -988,7 +988,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)
         * Note: exclude_{guest,host} do not apply here.
         *       This command processes KVM tracepoints from host only
         */
-       evlist__for_each(evlist, pos) {
+       evlist__for_each_entry(evlist, pos) {
                struct perf_event_attr *attr = &pos->attr;
 
                /* make sure these *are* set */
@@ -1426,11 +1426,9 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
        err = kvm_events_live_report(kvm);
 
 out:
-       if (kvm->session)
-               perf_session__delete(kvm->session);
+       perf_session__delete(kvm->session);
        kvm->session = NULL;
-       if (kvm->evlist)
-               perf_evlist__delete(kvm->evlist);
+       perf_evlist__delete(kvm->evlist);
 
        return err;
 }