From 1640c775738d6612f733463d55a5ce6d03c0aae1 Mon Sep 17 00:00:00 2001 From: David Ahern Date: Mon, 8 Oct 2012 11:17:32 -0600 Subject: [PATCH] --- yaml --- r: 338871 b: refs/heads/master c: 355afe816312faf20d81fdcade29e0361d72a7b4 h: refs/heads/master i: 338869: ccbb951e3b325ada2c0220388263705f6aa23000 338867: a82546bea5a2f6873528f5ffa32d372061b9f486 338863: 2de3614ff212a3a0eb53e5cc239eb7d4b9cb80d6 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-kvm.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f426fbb79a62..090a57783f84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4f7637f8aefa2ad5159a1cda46fedea6eaf64fc +refs/heads/master: 355afe816312faf20d81fdcade29e0361d72a7b4 diff --git a/trunk/tools/perf/builtin-kvm.c b/trunk/tools/perf/builtin-kvm.c index 72a302e7807e..836c82f01371 100644 --- a/trunk/tools/perf/builtin-kvm.c +++ b/trunk/tools/perf/builtin-kvm.c @@ -369,9 +369,10 @@ static struct kvm_event *find_create_kvm_event(struct perf_kvm *kvm, BUG_ON(key->key == INVALID_KEY); head = &kvm->kvm_events_cache[kvm_events_hash_fn(key->key)]; - list_for_each_entry(event, head, hash_entry) + list_for_each_entry(event, head, hash_entry) { if (event->key.key == key->key && event->key.info == key->info) return event; + } event = kvm_alloc_init_event(key); if (!event) @@ -610,13 +611,15 @@ static void sort_result(struct perf_kvm *kvm) int vcpu = kvm->trace_vcpu; struct kvm_event *event; - for (i = 0; i < EVENTS_CACHE_SIZE; i++) - list_for_each_entry(event, &kvm->kvm_events_cache[i], hash_entry) + for (i = 0; i < EVENTS_CACHE_SIZE; i++) { + list_for_each_entry(event, &kvm->kvm_events_cache[i], hash_entry) { if (event_is_valid(event, vcpu)) { update_total_count(kvm, event); insert_to_result(&kvm->result, event, kvm->compare, vcpu); } + } + } } /* returns left most element of result, and erase it */