OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/log: Remove qemu_log_close

Browse Source 
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.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220417183019.755276-32-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 11:30:11 -07:00
parent b2528af10a
commit ec0d1849d9
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu.c
View File

@ -407,7 +407,6 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...)
cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP); cpu_dump_state(cpu, logfile, CPU_DUMP_FPU | CPU_DUMP_CCOP);
qemu_log_unlock(logfile); qemu_log_unlock(logfile);
} }
qemu_log_close();
} }
va_end(ap2); va_end(ap2);
va_end(ap); va_end(ap);

3
include/qemu/log.h
View File

@ -92,7 +92,4 @@ int qemu_str_to_log_mask(const char *str);
*/ */
void qemu_print_log_usage(FILE *f); void qemu_print_log_usage(FILE *f);
/* Close the log file */
void qemu_log_close(void);
#endif #endif

4
tests/unit/test-logging.c
View File

@ -169,7 +169,7 @@ static void test_logfile_lock(gconstpointer data)
* Initiate a close file and make sure our handle remains * Initiate a close file and make sure our handle remains
* valid since we still have the logfile lock. * 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__); fprintf(logfile, "%s 2nd write to file\n", __func__);
fflush(logfile); fflush(logfile);
qemu_log_unlock(logfile); qemu_log_unlock(logfile);
@ -207,7 +207,7 @@ int main(int argc, char **argv)
tmp_path, test_logfile_lock); tmp_path, test_logfile_lock);
rc = g_test_run(); rc = g_test_run();
qemu_log_close(); qemu_set_log_filename_flags(NULL, 0, &error_abort);
drain_call_rcu(); drain_call_rcu();
rmdir_full(tmp_path); rmdir_full(tmp_path);

17
util/log.c
View File

@ -198,7 +198,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
if (is_daemonized()) { if (is_daemonized()) {
dup2(fileno(fd), STDERR_FILENO); dup2(fileno(fd), STDERR_FILENO);
fclose(fd); fclose(fd);
/* This will skip closing logfile in qemu_log_close() */ /* This will skip closing logfile in qemu_logfile_free. */
fd = stderr; fd = stderr;
} }
} else { } else {
@ -322,21 +322,6 @@ out:
g_strfreev(ranges); 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[] = { const QEMULogItem qemu_log_items[] = {
{ CPU_LOG_TB_OUT_ASM, "out_asm", { CPU_LOG_TB_OUT_ASM, "out_asm",
"show generated host assembly code for each compiled TB" }, "show generated host assembly code for each compiled TB" },