diff --git a/exec.c b/exec.c index 6384df270f..046e967395 100644 --- a/exec.c +++ b/exec.c @@ -1281,8 +1281,10 @@ int cpu_str_to_log_mask(const char *str) void cpu_abort(CPUState *env, const char *fmt, ...) { va_list ap; + va_list ap2; va_start(ap, fmt); + va_copy(ap2, ap); fprintf(stderr, "qemu: fatal: "); vfprintf(stderr, fmt, ap); fprintf(stderr, "\n"); @@ -1298,7 +1300,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...) #endif if (logfile) { fprintf(logfile, "qemu: fatal: "); - vfprintf(logfile, fmt, ap); + vfprintf(logfile, fmt, ap2); fprintf(logfile, "\n"); #ifdef TARGET_I386 cpu_dump_state(env, logfile, fprintf, X86_DUMP_FPU | X86_DUMP_CCOP); @@ -1308,6 +1310,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...) fflush(logfile); fclose(logfile); } + va_end(ap2); va_end(ap); abort(); }