hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools lib traceevent: Fix and cleanup kvm_nested_vmexit tracepoints 

Fix several issues of kvm_nested_vmexit[_inject]: field width aren't
supported with pevent_print, rip was printed twice/incorrectly, SVM ISA
was hard-coded, we don't use ':' to separate field names.

Link: http://lkml.kernel.org/r/8e6c02b22ea8136c139a91c69d6cc73b8c5c184b.1388855989.git.jan.kiszka@web.de

Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
This commit is contained in:
Jan Kiszka 2014-06-12 22:10:06 -04:00 committed by Jiri Olsa
parent ea092aeb6d
commit 7f6e3635db
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/lib/traceevent/plugin_kvm.c
View File

@ -330,19 +330,13 @@ static int kvm_emulate_insn_handler(struct trace_seq *s,
static int kvm_nested_vmexit_inject_handler(struct trace_seq *s, struct pevent_record *record, static int kvm_nested_vmexit_inject_handler(struct trace_seq *s, struct pevent_record *record,
struct event_format *event, void *context) struct event_format *event, void *context)
{ {
unsigned long long val; if (print_exit_reason(s, record, event, "exit_code") < 0)
pevent_print_num_field(s, " rip %0x016llx", event, "rip", record, 1);
if (pevent_get_field_val(s, event, "exit_code", record, &val, 1) < 0)
return -1; return -1;
trace_seq_printf(s, "reason %s", find_exit_reason(2, val)); pevent_print_num_field(s, " info1 %llx", event, "exit_info1", record, 1);
pevent_print_num_field(s, " info2 %llx", event, "exit_info2", record, 1);
pevent_print_num_field(s, " ext_inf1: %0x016llx", event, "exit_info1", record, 1); pevent_print_num_field(s, " int_info %llx", event, "exit_int_info", record, 1);
pevent_print_num_field(s, " ext_inf2: %0x016llx", event, "exit_info2", record, 1); pevent_print_num_field(s, " int_info_err %llx", event, "exit_int_info_err", record, 1);
pevent_print_num_field(s, " ext_int: %0x016llx", event, "exit_int_info", record, 1);
pevent_print_num_field(s, " ext_int_err: %0x016llx", event, "exit_int_info_err", record, 1);
return 0; return 0;
} }
@ -350,7 +344,7 @@ static int kvm_nested_vmexit_inject_handler(struct trace_seq *s, struct pevent_r
static int kvm_nested_vmexit_handler(struct trace_seq *s, struct pevent_record *record, static int kvm_nested_vmexit_handler(struct trace_seq *s, struct pevent_record *record,
struct event_format *event, void *context) struct event_format *event, void *context)
{ {
pevent_print_num_field(s, " rip %0x016llx", event, "rip", record, 1); pevent_print_num_field(s, "rip %lx ", event, "rip", record, 1);
return kvm_nested_vmexit_inject_handler(s, record, event, context); return kvm_nested_vmexit_inject_handler(s, record, event, context);
} }