KVM: s390: Use intercept_insn decoder in trace event

The current trace definition doesn't work very well with the perf tool.
Perf shows a "insn_to_mnemonic not found" message. Let's handle the
decoding completely in a parseable format.

Signed-off-by: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/trace.h
index 00f57a507ea2..579b42afab40 100644
--- a/arch/s390/kvm/trace.h
+++ b/arch/s390/kvm/trace.h
@@ -154,7 +154,6 @@ TRACE_EVENT(kvm_s390_intercept_instruction,
             TP_STRUCT__entry(
                     VCPU_FIELD_COMMON
                     __field(__u64, instruction)
-                    __field(char, insn[8])
                     ),
 
             TP_fast_assign(
@@ -165,10 +164,8 @@ TRACE_EVENT(kvm_s390_intercept_instruction,
 
             VCPU_TP_PRINTK("intercepted instruction %016llx (%s)",
                            __entry->instruction,
-                           insn_to_mnemonic((unsigned char *)
-                                            &__entry->instruction,
-                                         __entry->insn, sizeof(__entry->insn)) ?
-                           "unknown" : __entry->insn)
+                           __print_symbolic(icpt_insn_decoder(__entry->instruction),
+                                            icpt_insn_codes))
         );
 
 /*