From: Richard Henderson <richard.henderson@linaro.org>
Date: Sun, 17 Apr 2022 18:29:54 +0000 (-0700)
Subject: accel/tcg: Use cpu_dump_state between qemu_log_trylock/unlock
X-Git-Tag: v7.1.0-rc0~144^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c769fbd7deca8e47b8b0fd508ba2e5e108c5c5c4;p=thirdparty%2Fqemu.git

accel/tcg: Use cpu_dump_state between qemu_log_trylock/unlock

Inside log_cpu_state, we perform qemu_log_trylock/unlock, which need
not be done if we have already performed the lock beforehand.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220417183019.755276-15-richard.henderson@linaro.org>
---

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 8b7f9a30656..635aeecc0ad 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -224,7 +224,7 @@ static inline void log_cpu_exec(target_ulong pc, CPUState *cpu,
 #if defined(TARGET_I386)
                 flags |= CPU_DUMP_CCOP;
 #endif
-                log_cpu_state(cpu, flags);
+                cpu_dump_state(cpu, logfile, flags);
                 qemu_log_unlock(logfile);
             }
         }