From: tip-bot for Jan Kiszka <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
jolsa@kernel.org, jan.kiszka@siemens.com, namhyung@kernel.org,
rostedt@goodmis.org, tglx@linutronix.de
Subject: [tip:perf/core] tools lib traceevent: Fix and cleanup kvm_nested_vmexit tracepoints
Date: Tue, 24 Jun 2014 22:49:20 -0700 [thread overview]
Message-ID: <tip-7f6e3635db39fb2400dc515192125e7b73258000@git.kernel.org> (raw)
In-Reply-To: <8e6c02b22ea8136c139a91c69d6cc73b8c5c184b.1388855989.git.jan.kiszka@web.de>
Commit-ID: 7f6e3635db39fb2400dc515192125e7b73258000
Gitweb: http://git.kernel.org/tip/7f6e3635db39fb2400dc515192125e7b73258000
Author: Jan Kiszka <jan.kiszka@siemens.com>
AuthorDate: Thu, 12 Jun 2014 22:10:06 -0400
Committer: Jiri Olsa <jolsa@kernel.org>
CommitDate: Thu, 19 Jun 2014 18:18:30 +0200
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>
---
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 0d43783..0575e59 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);
return kvm_nested_vmexit_inject_handler(s, record, event, context);
}
prev parent reply other threads:[~2014-06-25 5:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-04 17:19 [PATCH 0/3] trace-cmd: Updates for kvm plugin Jan Kiszka
2014-01-04 17:19 ` [PATCH 1/3] trace-cmd: Report unknown VMX exit reasons with code Jan Kiszka
2014-01-04 17:19 ` [PATCH 2/3] trace-cmd: Factor out print_exit_reason in kvm plugin Jan Kiszka
2014-06-25 5:48 ` [tip:perf/core] tools lib traceevent: " tip-bot for Jan Kiszka
2014-01-04 17:19 ` [PATCH 3/3] trace-cmd: Fix and cleanup kvm_nested_vmexit tracepoints Jan Kiszka
2014-06-25 5:49 ` tip-bot for Jan Kiszka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7f6e3635db39fb2400dc515192125e7b73258000@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jan.kiszka@siemens.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome