This standardizes kvm exit reason field name by replacing "esr_ec" with "exit_reason". Signed-off-by: Gavin Shan <gshan@xxxxxxxxxx> --- virt/kvm/arm/trace.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/virt/kvm/arm/trace.h b/virt/kvm/arm/trace.h index 204d210d01c2..0ac774fd324d 100644 --- a/virt/kvm/arm/trace.h +++ b/virt/kvm/arm/trace.h @@ -27,25 +27,27 @@ TRACE_EVENT(kvm_entry, ); TRACE_EVENT(kvm_exit, - TP_PROTO(int ret, unsigned int esr_ec, unsigned long vcpu_pc), - TP_ARGS(ret, esr_ec, vcpu_pc), + TP_PROTO(int ret, unsigned int exit_reason, unsigned long vcpu_pc), + TP_ARGS(ret, exit_reason, vcpu_pc), TP_STRUCT__entry( __field( int, ret ) - __field( unsigned int, esr_ec ) + __field( unsigned int, exit_reason ) __field( unsigned long, vcpu_pc ) ), TP_fast_assign( __entry->ret = ARM_EXCEPTION_CODE(ret); - __entry->esr_ec = ARM_EXCEPTION_IS_TRAP(ret) ? esr_ec : 0; + __entry->exit_reason = + ARM_EXCEPTION_IS_TRAP(ret) ? exit_reason: 0; __entry->vcpu_pc = vcpu_pc; ), TP_printk("%s: HSR_EC: 0x%04x (%s), PC: 0x%08lx", __print_symbolic(__entry->ret, kvm_arm_exception_type), - __entry->esr_ec, - __print_symbolic(__entry->esr_ec, kvm_arm_exception_class), + __entry->exit_reason, + __print_symbolic(__entry->exit_reason, + kvm_arm_exception_class), __entry->vcpu_pc) ); -- 2.23.0