[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 31/39] util/log: Remove qemu_log_close
From: |
Richard Henderson |
Subject: |
[PATCH v2 31/39] util/log: Remove qemu_log_close |
Date: |
Sat, 26 Mar 2022 07:25:26 -0600 |
The only real use is in cpu_abort, where we have just
flushed the file via qemu_log_unlock, and are just about
to force-crash the application via abort. We do not
really need to close the FILE before the abort.
The two uses in test-logging.c can be handled with
qemu_set_log_filename_flags.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/log.h | 3 ---
cpu.c | 1 -
tests/unit/test-logging.c | 4 ++--
util/log.c | 17 +----------------
4 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/include/qemu/log.h b/include/qemu/log.h
index b6c73376b5..a325bca661 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -92,7 +92,4 @@ int qemu_str_to_log_mask(const char *str);
*/
void qemu_print_log_usage(FILE *f);
-/* Close the log file */
-void qemu_log_close(void);
-
#endif
diff --git a/cpu.c b/cpu.c
index bfa4db9cd8..7df12537d5 100644
--- a/cpu.c
+++ b/cpu.c
@@ -408,7 +408,6 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...)
cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP);
qemu_log_unlock(logfile);
}
- qemu_log_close();
}
va_end(ap2);
va_end(ap);
diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c
index 9b87af75af..74ec89f1a8 100644
--- a/tests/unit/test-logging.c
+++ b/tests/unit/test-logging.c
@@ -170,7 +170,7 @@ static void test_logfile_lock(gconstpointer data)
* Initiate a close file and make sure our handle remains
* valid since we still have the logfile lock.
*/
- qemu_log_close();
+ qemu_set_log_filename_flags(NULL, 0, &error_abort);
fprintf(logfile, "%s 2nd write to file\n", __func__);
fflush(logfile);
qemu_log_unlock(logfile);
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
tmp_path, test_logfile_lock);
rc = g_test_run();
- qemu_log_close();
+ qemu_set_log_filename_flags(NULL, 0, &error_abort);
drain_call_rcu();
rmdir_full(tmp_path);
diff --git a/util/log.c b/util/log.c
index 2152d5591e..491a8f97f9 100644
--- a/util/log.c
+++ b/util/log.c
@@ -198,7 +198,7 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
if (is_daemonized()) {
dup2(fileno(fd), STDERR_FILENO);
fclose(fd);
- /* This will skip closing logfile in qemu_log_close() */
+ /* This will skip closing logfile in qemu_logfile_free. */
fd = stderr;
}
} else {
@@ -322,21 +322,6 @@ out:
g_strfreev(ranges);
}
-/* Close the log file */
-void qemu_log_close(void)
-{
- QemuLogFile *logfile;
-
- qemu_mutex_lock(&qemu_logfile_mutex);
- logfile = qemu_logfile;
-
- if (logfile) {
- qatomic_rcu_set(&qemu_logfile, NULL);
- call_rcu(logfile, qemu_logfile_free, rcu);
- }
- qemu_mutex_unlock(&qemu_logfile_mutex);
-}
-
const QEMULogItem qemu_log_items[] = {
{ CPU_LOG_TB_OUT_ASM, "out_asm",
"show generated host assembly code for each compiled TB" },
--
2.25.1
- [PATCH v2 12/39] exec/translator: Pass the locked filepointer to disas_log hook, (continued)
- [PATCH v2 12/39] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/03/26
- [PATCH v2 19/39] util/log: Remove qemu_log_flush, Richard Henderson, 2022/03/26
- [PATCH v2 16/39] util/log: Use qemu_log_trylock/unlock in qemu_log, Richard Henderson, 2022/03/26
- [PATCH v2 25/39] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/03/26
- [PATCH v2 24/39] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/03/26
- [PATCH v2 15/39] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/03/26
- [PATCH v2 20/39] util/log: Drop call to setvbuf, Richard Henderson, 2022/03/26
- [PATCH v2 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file, Richard Henderson, 2022/03/26
- [PATCH v2 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/26
- [PATCH v2 14/39] accel/tcg: Use cpu_dump_state between qemu_log_trylock/unlock, Richard Henderson, 2022/03/26
- [PATCH v2 31/39] util/log: Remove qemu_log_close,
Richard Henderson <=
- [PATCH v2 30/39] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/26
- [PATCH v2 29/39] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/26
- [PATCH v2 18/39] util/log: Mark qemu_log_trylock as G_GNUC_WARN_UNUSED_RESULT, Richard Henderson, 2022/03/26
- [PATCH v2 17/39] util/log: Drop return value from qemu_log, Richard Henderson, 2022/03/26
- [PATCH v2 21/39] bsd-user: Expand log_page_dump inline, Richard Henderson, 2022/03/26
- [PATCH v2 23/39] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/03/26
- [PATCH v2 22/39] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/03/26
- [PATCH v2 27/39] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/03/26
- [PATCH v2 33/39] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/03/26
- [PATCH v2 34/39] util/log: Rename qemu_logfile_mutex to global_mutex, Richard Henderson, 2022/03/26