Hi Steve, 2014-06-12 (목), 22:10 -0400, Steven Rostedt: > From: Jan Kiszka <jan.kis...@siemens.com> > > 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.kis...@web.de > > Signed-off-by: Jan Kiszka <jan.kis...@siemens.com> > Signed-off-by: Steven Rostedt <rost...@goodmis.org> > --- > tools/lib/traceevent/plugin_kvm.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/tools/lib/traceevent/plugin_kvm.c > b/tools/lib/traceevent/plugin_kvm.c > index 0d437837569f..0575e59c65f0 100644 > --- a/tools/lib/traceevent/plugin_kvm.c > +++ b/tools/lib/traceevent/plugin_kvm.c > @@ -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, > struct event_format *event, void > *context) > { > - unsigned long long val; > - > - pevent_print_num_field(s, " rip %0x016llx", event, "rip", record, 1); > - > - if (pevent_get_field_val(s, event, "exit_code", record, &val, 1) < 0) > + if (print_exit_reason(s, record, event, "exit_code") < 0) > return -1; > > - trace_seq_printf(s, "reason %s", find_exit_reason(2, val)); > - > - pevent_print_num_field(s, " ext_inf1: %0x016llx", event, "exit_info1", > record, 1); > - pevent_print_num_field(s, " ext_inf2: %0x016llx", event, "exit_info2", > 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); > + 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, " int_info %llx", event, "exit_int_info", > record, 1); > + pevent_print_num_field(s, " int_info_err %llx", event, > "exit_int_info_err", record, 1); > > 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, > 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);
s/%lx/%llx/ Otherwise this series and previous two cleanup patches look good to me. Acked-by: Namhyung Kim <namhy...@kernel.org> Thanks, Namhyung > > return kvm_nested_vmexit_inject_handler(s, record, event, context); > } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
