[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 16/36] util/log: Remove qemu_log_flush
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 16/36] util/log: Remove qemu_log_flush |
Date: |
Sun, 20 Mar 2022 10:11:15 -0700 |
All uses flush output immediately before or after qemu_log_unlock.
Instead of a separate call, move the flush into qemu_log_unlock.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/log.h | 2 --
accel/tcg/translate-all.c | 1 -
cpu.c | 1 -
hw/net/can/can_sja1000.c | 1 -
hw/xen/xen_pvdev.c | 1 -
net/can/can_socketcan.c | 1 -
tcg/tcg.c | 1 -
util/log.c | 14 +-------------
8 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 6e45b31253..10578ba21c 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -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);
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 4af7455522..837f50f5b9 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -1595,7 +1595,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
}
}
fprintf(logfile, "\n");
- qemu_log_flush();
qemu_log_unlock(logfile);
}
}
diff --git a/cpu.c b/cpu.c
index 159d0b0d1d..054f21b307 100644
--- a/cpu.c
+++ b/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();
}
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index 919e93664d..3d144508a2 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -260,7 +260,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);
}
}
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index 355bbda60d..9095080b0d 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -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)
diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c
index ae19d35001..47743e5fd9 100644
--- a/net/can/can_socketcan.c
+++ b/net/can/can_socketcan.c
@@ -88,7 +88,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);
}
}
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 1e27367af6..e5d45eca9f 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -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);
}
}
diff --git a/util/log.c b/util/log.c
index 3ec6e90575..73597c40c0 100644
--- a/util/log.c
+++ b/util/log.c
@@ -54,6 +54,7 @@ FILE *qemu_log_lock(void)
void qemu_log_unlock(FILE *fd)
{
if (fd) {
+ fflush(fd);
qemu_funlockfile(fd);
rcu_read_unlock();
}
@@ -277,19 +278,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)
{
--
2.25.1
- Re: [PULL for-7.1 01/36] util/log: Drop manual log buffering, (continued)
- [PULL for-7.1 02/36] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/03/20
- [PULL for-7.1 04/36] os-posix: Use qemu_log_enabled, Richard Henderson, 2022/03/20
- [PULL for-7.1 08/36] *: Use fprintf between qemu_log_lock/unlock, Richard Henderson, 2022/03/20
- [PULL for-7.1 07/36] hw/xen: Split out xen_pv_output_msg, Richard Henderson, 2022/03/20
- [PULL for-7.1 16/36] util/log: Remove qemu_log_flush,
Richard Henderson <=
- [PULL for-7.1 11/36] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/03/20
- [PULL for-7.1 14/36] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/03/20
- [PULL for-7.1 25/36] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 20/36] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/03/20
- [PULL for-7.1 03/36] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/03/20
- [PULL for-7.1 05/36] util/log: Move qemu_log_lock, qemu_log_unlock out of line, Richard Henderson, 2022/03/20