From: Alex Bennée <alex.bennee@linaro.org>
Date: Thu, 27 Oct 2016 15:10:01 +0000 (+0100)
Subject: cpu-exec: include cpu_index in CPU_LOG_EXEC messages
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4426f83a9ac7bbce48602c712333efc79cd57b29;p=qemu.git

cpu-exec: include cpu_index in CPU_LOG_EXEC messages

Even more important when debugging MTTCG is seeing which vCPU is
currently executing.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Message-Id: <20161027151030.20863-5-alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/cpu-exec.c b/cpu-exec.c
index c9997935dd..4879c7deff 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -143,8 +143,9 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb)
     uint8_t *tb_ptr = itb->tc_ptr;
 
     qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,
-                           "Trace %p [" TARGET_FMT_lx "] %s\n",
-                           itb->tc_ptr, itb->pc, lookup_symbol(itb->pc));
+                           "Trace %p [%d: " TARGET_FMT_lx "] %s\n",
+                           itb->tc_ptr, cpu->cpu_index, itb->pc,
+                           lookup_symbol(itb->pc));
 
 #if defined(DEBUG_DISAS)
     if (qemu_loglevel_mask(CPU_LOG_TB_CPU)