aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/trace.h
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2010-02-19 10:23:09 -0500
committerAvi Kivity <avi@redhat.com>2010-04-25 05:34:31 -0400
commit052ce6211c4f7309988068fccdb7204c721871df (patch)
treeacebf1e95a1d9e79446919d20d860d2dff755f40 /arch/x86/kvm/trace.h
parent66a562f7e2576cde384ec813b481404d8f54f4c6 (diff)
KVM: SVM: Remove newlines from nested trace points
The tracing infrastructure adds its own newlines. Remove them from the trace point printk format strings. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/trace.h')
-rw-r--r--arch/x86/kvm/trace.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index 6ad30a29f044..12f8d2dee984 100644
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -413,7 +413,7 @@ TRACE_EVENT(kvm_nested_vmrun,
413 ), 413 ),
414 414
415 TP_printk("rip: 0x%016llx vmcb: 0x%016llx nrip: 0x%016llx int_ctl: 0x%08x " 415 TP_printk("rip: 0x%016llx vmcb: 0x%016llx nrip: 0x%016llx int_ctl: 0x%08x "
416 "event_inj: 0x%08x npt: %s\n", 416 "event_inj: 0x%08x npt: %s",
417 __entry->rip, __entry->vmcb, __entry->nested_rip, 417 __entry->rip, __entry->vmcb, __entry->nested_rip,
418 __entry->int_ctl, __entry->event_inj, 418 __entry->int_ctl, __entry->event_inj,
419 __entry->npt ? "on" : "off") 419 __entry->npt ? "on" : "off")
@@ -447,7 +447,7 @@ TRACE_EVENT(kvm_nested_vmexit,
447 __entry->exit_int_info_err = exit_int_info_err; 447 __entry->exit_int_info_err = exit_int_info_err;
448 ), 448 ),
449 TP_printk("rip: 0x%016llx reason: %s ext_inf1: 0x%016llx " 449 TP_printk("rip: 0x%016llx reason: %s ext_inf1: 0x%016llx "
450 "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x\n", 450 "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
451 __entry->rip, 451 __entry->rip,
452 ftrace_print_symbols_seq(p, __entry->exit_code, 452 ftrace_print_symbols_seq(p, __entry->exit_code,
453 kvm_x86_ops->exit_reasons_str), 453 kvm_x86_ops->exit_reasons_str),
@@ -482,7 +482,7 @@ TRACE_EVENT(kvm_nested_vmexit_inject,
482 ), 482 ),
483 483
484 TP_printk("reason: %s ext_inf1: 0x%016llx " 484 TP_printk("reason: %s ext_inf1: 0x%016llx "
485 "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x\n", 485 "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
486 ftrace_print_symbols_seq(p, __entry->exit_code, 486 ftrace_print_symbols_seq(p, __entry->exit_code,
487 kvm_x86_ops->exit_reasons_str), 487 kvm_x86_ops->exit_reasons_str),
488 __entry->exit_info1, __entry->exit_info2, 488 __entry->exit_info1, __entry->exit_info2,
@@ -504,7 +504,7 @@ TRACE_EVENT(kvm_nested_intr_vmexit,
504 __entry->rip = rip 504 __entry->rip = rip
505 ), 505 ),
506 506
507 TP_printk("rip: 0x%016llx\n", __entry->rip) 507 TP_printk("rip: 0x%016llx", __entry->rip)
508); 508);
509 509
510/* 510/*
@@ -526,7 +526,7 @@ TRACE_EVENT(kvm_invlpga,
526 __entry->address = address; 526 __entry->address = address;
527 ), 527 ),
528 528
529 TP_printk("rip: 0x%016llx asid: %d address: 0x%016llx\n", 529 TP_printk("rip: 0x%016llx asid: %d address: 0x%016llx",
530 __entry->rip, __entry->asid, __entry->address) 530 __entry->rip, __entry->asid, __entry->address)
531); 531);
532 532
@@ -547,7 +547,7 @@ TRACE_EVENT(kvm_skinit,
547 __entry->slb = slb; 547 __entry->slb = slb;
548 ), 548 ),
549 549
550 TP_printk("rip: 0x%016llx slb: 0x%08x\n", 550 TP_printk("rip: 0x%016llx slb: 0x%08x",
551 __entry->rip, __entry->slb) 551 __entry->rip, __entry->slb)
552); 552);
553 553