This standardizes kvm exit reason field name by replacing "exit_nr" with "exit_reason". Signed-off-by: Gavin Shan <gshan@xxxxxxxxxx> --- arch/powerpc/kvm/trace_booke.h | 10 +++++----- arch/powerpc/kvm/trace_pr.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/kvm/trace_booke.h b/arch/powerpc/kvm/trace_booke.h index 3837842986aa..f757ce1dccb9 100644 --- a/arch/powerpc/kvm/trace_booke.h +++ b/arch/powerpc/kvm/trace_booke.h @@ -36,11 +36,11 @@ {41, "HV_PRIV"} TRACE_EVENT(kvm_exit, - TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), - TP_ARGS(exit_nr, vcpu), + TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu), + TP_ARGS(exit_reason, vcpu), TP_STRUCT__entry( - __field( unsigned int, exit_nr ) + __field( unsigned int, exit_reason ) __field( unsigned long, pc ) __field( unsigned long, msr ) __field( unsigned long, dar ) @@ -48,7 +48,7 @@ TRACE_EVENT(kvm_exit, ), TP_fast_assign( - __entry->exit_nr = exit_nr; + __entry->exit_reason = exit_reason; __entry->pc = kvmppc_get_pc(vcpu); __entry->dar = kvmppc_get_fault_dar(vcpu); __entry->msr = vcpu->arch.shared->msr; @@ -61,7 +61,7 @@ TRACE_EVENT(kvm_exit, " | dar=0x%lx" " | last_inst=0x%lx" , - __print_symbolic(__entry->exit_nr, kvm_trace_symbol_exit), + __print_symbolic(__entry->exit_reason, kvm_trace_symbol_exit), __entry->pc, __entry->msr, __entry->dar, diff --git a/arch/powerpc/kvm/trace_pr.h b/arch/powerpc/kvm/trace_pr.h index 46a46d328fbf..b6039777e2b4 100644 --- a/arch/powerpc/kvm/trace_pr.h +++ b/arch/powerpc/kvm/trace_pr.h @@ -215,11 +215,11 @@ TRACE_EVENT(kvm_book3s_slbmte, ); TRACE_EVENT(kvm_exit, - TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), - TP_ARGS(exit_nr, vcpu), + TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu), + TP_ARGS(exit_reason, vcpu), TP_STRUCT__entry( - __field( unsigned int, exit_nr ) + __field( unsigned int, exit_reason ) __field( unsigned long, pc ) __field( unsigned long, msr ) __field( unsigned long, dar ) @@ -228,7 +228,7 @@ TRACE_EVENT(kvm_exit, ), TP_fast_assign( - __entry->exit_nr = exit_nr; + __entry->exit_reason = exit_reason; __entry->pc = kvmppc_get_pc(vcpu); __entry->dar = kvmppc_get_fault_dar(vcpu); __entry->msr = kvmppc_get_msr(vcpu); @@ -243,7 +243,7 @@ TRACE_EVENT(kvm_exit, " | srr1=0x%lx" " | last_inst=0x%lx" , - __print_symbolic(__entry->exit_nr, kvm_trace_symbol_exit), + __print_symbolic(__entry->exit_reason, kvm_trace_symbol_exit), __entry->pc, __entry->msr, __entry->dar, -- 2.23.0