util/log: Remove qemu_log_flush
All uses flush output immediately before or after qemu_log_unlock. Instead of a separate call, move the flush into qemu_log_unlock. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220417183019.755276-20-richard.henderson@linaro.org>
This commit is contained in:
parent
27ea81337f
commit
90f37362d7
@ -1594,7 +1594,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
|
||||
}
|
||||
}
|
||||
fprintf(logfile, "\n");
|
||||
qemu_log_flush();
|
||||
qemu_log_unlock(logfile);
|
||||
}
|
||||
}
|
||||
|
1
cpu.c
1
cpu.c
@ -405,7 +405,6 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...)
|
||||
vfprintf(logfile, fmt, ap2);
|
||||
fprintf(logfile, "\n");
|
||||
cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP);
|
||||
qemu_log_flush();
|
||||
qemu_log_unlock(logfile);
|
||||
}
|
||||
qemu_log_close();
|
||||
|
@ -261,7 +261,6 @@ static void can_display_msg(const char *prefix, const qemu_can_frame *msg)
|
||||
fprintf(logfile, " %02X", msg->data[i]);
|
||||
}
|
||||
fprintf(logfile, "\n");
|
||||
qemu_log_flush();
|
||||
qemu_log_unlock(logfile);
|
||||
}
|
||||
}
|
||||
|
@ -230,7 +230,6 @@ void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
|
||||
xen_pv_output_msg(xendev, stderr, fmt, args);
|
||||
va_end(args);
|
||||
}
|
||||
qemu_log_flush();
|
||||
}
|
||||
|
||||
void xen_pv_evtchn_event(void *opaque)
|
||||
|
@ -121,8 +121,6 @@ int qemu_str_to_log_mask(const char *str);
|
||||
*/
|
||||
void qemu_print_log_usage(FILE *f);
|
||||
|
||||
/* fflush() the log file */
|
||||
void qemu_log_flush(void);
|
||||
/* Close the log file */
|
||||
void qemu_log_close(void);
|
||||
|
||||
|
@ -89,7 +89,6 @@ static void can_host_socketcan_display_msg(struct qemu_can_frame *msg)
|
||||
fprintf(logfile, " %02X", msg->data[i]);
|
||||
}
|
||||
fprintf(logfile, "\n");
|
||||
qemu_log_flush();
|
||||
qemu_log_unlock(logfile);
|
||||
}
|
||||
}
|
||||
|
@ -783,7 +783,6 @@ void tcg_prologue_init(TCGContext *s)
|
||||
disas(logfile, s->code_gen_ptr, prologue_size);
|
||||
}
|
||||
fprintf(logfile, "\n");
|
||||
qemu_log_flush();
|
||||
qemu_log_unlock(logfile);
|
||||
}
|
||||
}
|
||||
|
14
util/log.c
14
util/log.c
@ -54,6 +54,7 @@ FILE *qemu_log_trylock(void)
|
||||
void qemu_log_unlock(FILE *fd)
|
||||
{
|
||||
if (fd) {
|
||||
fflush(fd);
|
||||
qemu_funlockfile(fd);
|
||||
rcu_read_unlock();
|
||||
}
|
||||
@ -269,19 +270,6 @@ out:
|
||||
g_strfreev(ranges);
|
||||
}
|
||||
|
||||
/* fflush() the log file */
|
||||
void qemu_log_flush(void)
|
||||
{
|
||||
QemuLogFile *logfile;
|
||||
|
||||
rcu_read_lock();
|
||||
logfile = qatomic_rcu_read(&qemu_logfile);
|
||||
if (logfile) {
|
||||
fflush(logfile->fd);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
}
|
||||
|
||||
/* Close the log file */
|
||||
void qemu_log_close(void)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user