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

util/log: Combine two logfile closes 

Merge the close from the changed_name block with the close
from the !need_to_open_file block.

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

11
util/log.c
View File

@ -157,12 +157,6 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
g_free(global_filename); g_free(global_filename);
global_filename = newname; global_filename = newname;
filename = newname; filename = newname;
if (logfile) {
qatomic_rcu_set(&global_file, NULL);
call_rcu(logfile, qemu_logfile_free, rcu);
logfile = NULL;
}
} else { } else {
filename = global_filename; filename = global_filename;
} }
@ -182,11 +176,12 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
daemonized = is_daemonized(); daemonized = is_daemonized();
need_to_open_file = log_flags && (!daemonized || filename); need_to_open_file = log_flags && (!daemonized || filename);
if (logfile && !need_to_open_file) { if (logfile && (!need_to_open_file || changed_name)) {
qatomic_rcu_set(&global_file, NULL); qatomic_rcu_set(&global_file, NULL);
call_rcu(logfile, qemu_logfile_free, rcu); call_rcu(logfile, qemu_logfile_free, rcu);
return true; logfile = NULL;
} }
if (!logfile && need_to_open_file) { if (!logfile && need_to_open_file) {
FILE *fd; FILE *fd;