diff options
-rw-r--r-- | tools/lib/traceevent/plugin_kvm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/lib/traceevent/plugin_kvm.c b/tools/lib/traceevent/plugin_kvm.c index 9e0e8c61b43b..3e6122067d67 100644 --- a/tools/lib/traceevent/plugin_kvm.c +++ b/tools/lib/traceevent/plugin_kvm.c | |||
@@ -240,9 +240,8 @@ static const char *find_exit_reason(unsigned isa, int val) | |||
240 | for (i = 0; strings[i].val >= 0; i++) | 240 | for (i = 0; strings[i].val >= 0; i++) |
241 | if (strings[i].val == val) | 241 | if (strings[i].val == val) |
242 | break; | 242 | break; |
243 | if (strings[i].str) | 243 | |
244 | return strings[i].str; | 244 | return strings[i].str; |
245 | return "UNKNOWN"; | ||
246 | } | 245 | } |
247 | 246 | ||
248 | static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record, | 247 | static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record, |
@@ -251,6 +250,7 @@ static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record, | |||
251 | unsigned long long isa; | 250 | unsigned long long isa; |
252 | unsigned long long val; | 251 | unsigned long long val; |
253 | unsigned long long info1 = 0, info2 = 0; | 252 | unsigned long long info1 = 0, info2 = 0; |
253 | const char *reason; | ||
254 | 254 | ||
255 | if (pevent_get_field_val(s, event, "exit_reason", record, &val, 1) < 0) | 255 | if (pevent_get_field_val(s, event, "exit_reason", record, &val, 1) < 0) |
256 | return -1; | 256 | return -1; |
@@ -258,7 +258,11 @@ static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record, | |||
258 | if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0) | 258 | if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0) |
259 | isa = 1; | 259 | isa = 1; |
260 | 260 | ||
261 | trace_seq_printf(s, "reason %s", find_exit_reason(isa, val)); | 261 | reason = find_exit_reason(isa, val); |
262 | if (reason) | ||
263 | trace_seq_printf(s, "reason %s", reason); | ||
264 | else | ||
265 | trace_seq_printf(s, "reason UNKNOWN (%llu)", val); | ||
262 | 266 | ||
263 | pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1); | 267 | pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1); |
264 | 268 | ||