On 2013-08-11 09:59, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> > > Allows to parse the result even if the KVM plugin does not yet > understand a specific exit code. > > Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> > --- > plugin_kvm.c | 12 ++++++++---- > 1 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/plugin_kvm.c b/plugin_kvm.c > index 8a25cf1..59443e5 100644 > --- a/plugin_kvm.c > +++ b/plugin_kvm.c > @@ -240,9 +240,8 @@ static const char *find_exit_reason(unsigned isa, int val) > for (i = 0; strings[i].val >= 0; i++) > if (strings[i].val == val) > break; > - if (strings[i].str) > - return strings[i].str; > - return "UNKNOWN"; > + > + return strings[i].str; > } > > 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, > unsigned long long isa; > unsigned long long val; > unsigned long long info1 = 0, info2 = 0; > + const char *reason; > > if (pevent_get_field_val(s, event, "exit_reason", record, &val, 1) < 0) > return -1; > @@ -258,7 +258,11 @@ static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record, > if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0) > isa = 1; > > - trace_seq_printf(s, "reason %s", find_exit_reason(isa, val)); > + reason = find_exit_reason(isa, val); > + if (reason) > + trace_seq_printf(s, "reason %s", reason); > + else > + trace_seq_printf(s, "reason UNKNOWN (%llu)", val); > > pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1); > > Ping. While my other patch of that time was merged, this one didn't make it yet. Any open issues? Jan
Attachment:
signature.asc
Description: OpenPGP digital signature
