[PATCHv2] trace-cmd: add kvm_mmu_prepare_zap_page even and fix kvm_mmu_get_page event output in kvm plugin

Gleb Natapov
2012-12-27T11:34:16Z

kvm_mmu_zap_page event was renamed to kvm_mmu_prepare_zap_page. Add new
even, but leave the old one to parse older traces. Print out "created"
field for kvm_mmu_get_page event.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/plugin_kvm.c b/plugin_kvm.c
index 55812ef..9b376d8 100644
--- a/plugin_kvm.c
+++ b/plugin_kvm.c
@@ -382,7 +382,7 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct pevent_record *record,
} else
trace_seq_printf(s, "WORD: %08x", role.word);

- pevent_print_num_field(s, " root %u", event,
+ pevent_print_num_field(s, " root %u ", event,
"root_count", record, 1);

if (pevent_get_field_val(s, event, "unsync", record, &val, 1) < 0)
@@ -397,6 +397,11 @@ static int kvm_mmu_get_page_handler(struct trace_seq *s, struct pevent_record *r
{
unsigned long long val;

+ if (pevent_get_field_val(s, event, "created", record, &val, 1) < 0)
+ return -1;
+
+ trace_seq_printf(s, "%s ", val ? "new" : "existing");
+
if (pevent_get_field_val(s, event, "gfn", record, &val, 1) < 0)
return -1;

@@ -433,5 +438,9 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
pevent_register_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_zap_page",
kvm_mmu_print_role, NULL);

+ pevent_register_event_handler(pevent, -1, "kvmmmu",
+ "kvm_mmu_prepare_zap_page", kvm_mmu_print_role,
+ NULL);
+
return 0;
}
--
Gleb.