diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-11-01 16:53:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-11-01 16:53:05 +0000 |
| commit | 4eb28abd52d48657cff6ff45e8dbbbefe4dbb414 (patch) | |
| tree | 9b58e8217513ed2375850b9831762d01aea2ad80 /exec.c | |
| parent | c46ef897dbb75590af94b6e3dca6a9c5f9a1ea1e (diff) | |
| parent | 3ff91d7e85176f8b4b131163d7fd801757a2c949 (diff) | |
| download | focaccia-qemu-4eb28abd52d48657cff6ff45e8dbbbefe4dbb414.tar.gz focaccia-qemu-4eb28abd52d48657cff6ff45e8dbbbefe4dbb414.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20161101-2' into staging
tcg queued patches
# gpg: Signature made Tue 01 Nov 2016 16:45:42 GMT
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-tcg-20161101-2:
tcg: correct 32-bit tcg_gen_ld8s_i64 sign-extension
tcg/tcg.h: Improve documentation of TCGv_i32 etc types
MAINTAINERS: Update PPC status and maintainer
target-microblaze: Cleanup dec_mul
tcg: Add tcg_gen_mulsu2_{i32,i64,tl}
log: Add locking to large logging blocks
target-openrisc: Do not dump cpu state with -d in_asm
target-microblaze: Do not dump cpu state with -d in_asm
target-cris: Do not dump cpu state with -d in_asm
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/exec.c b/exec.c index 4d085812ca..b1094c0cd2 100644 --- a/exec.c +++ b/exec.c @@ -911,11 +911,13 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) fprintf(stderr, "\n"); cpu_dump_state(cpu, stderr, fprintf, CPU_DUMP_FPU | CPU_DUMP_CCOP); if (qemu_log_separate()) { + qemu_log_lock(); qemu_log("qemu: fatal: "); qemu_log_vprintf(fmt, ap2); qemu_log("\n"); log_cpu_state(cpu, CPU_DUMP_FPU | CPU_DUMP_CCOP); qemu_log_flush(); + qemu_log_unlock(); qemu_log_close(); } va_end(ap2); |