2010-11-29 17:25:57

by Avi Kivity

Subject: [PATCH trace-cmd] kvm: don't warn on new fields

The kvm plugin understands a few new fields; don't warn if they are missing,
as expected on older kernels.

Signed-off-by: Avi Kivity <[email protected]>
---
plugin_kvm.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin_kvm.c b/plugin_kvm.c
index c1cb2e4..8115235 100644
--- a/plugin_kvm.c
+++ b/plugin_kvm.c
@@ -249,15 +249,15 @@ static int kvm_exit_handler(struct trace_seq *s, struct record *record,
if (pevent_get_field_val(s, event, "exit_reason", record, &val, 1) < 0)
return -1;

- if (pevent_get_field_val(s, event, "isa", record, &isa, 1) < 0)
+ 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));

pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1);

- if (pevent_get_field_val(s, event, "info1", record, &info1, 1) >= 0
- && pevent_get_field_val(s, event, "info2", record, &info2, 1) >= 0)
+ if (pevent_get_field_val(s, event, "info1", record, &info1, 0) >= 0
+ && pevent_get_field_val(s, event, "info2", record, &info2, 0) >= 0)
trace_seq_printf(s, " info %llx %llx\n", info1, info2);

return 0;
--
1.7.1

2010-11-29 23:33:47

by Steven Rostedt

Subject: Re: [PATCH trace-cmd] kvm: don't warn on new fields

On Mon, 2010-11-29 at 19:25 +0200, Avi Kivity wrote:
> The kvm plugin understands a few new fields; don't warn if they are missing,
> as expected on older kernels.
>
> Signed-off-by: Avi Kivity <[email protected]>
> ---
> plugin_kvm.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)

Applied, Thanks Avi!

-- Steve