util/log: Rename logfilename to global_filename

Rename to emphasize this is the file-scope global variable.

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-33-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 11:30:12 -07:00
parent ec0d1849d9
commit 4226646481

View file

@ -34,7 +34,7 @@ typedef struct QemuLogFile {
FILE *fd; FILE *fd;
} QemuLogFile; } QemuLogFile;
static char *logfilename; static char *global_filename;
static QemuMutex qemu_logfile_mutex; static QemuMutex qemu_logfile_mutex;
static QemuLogFile *qemu_logfile; static QemuLogFile *qemu_logfile;
int qemu_loglevel; int qemu_loglevel;
@ -151,8 +151,8 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
} }
} }
g_free(logfilename); g_free(global_filename);
logfilename = newname; global_filename = newname;
filename = newname; filename = newname;
if (logfile) { if (logfile) {
@ -161,7 +161,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
logfile = NULL; logfile = NULL;
} }
} else { } else {
filename = logfilename; filename = global_filename;
} }
#ifdef CONFIG_TRACE_LOG #ifdef CONFIG_TRACE_LOG
@ -173,9 +173,8 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
* In all cases we only log if qemu_loglevel is set. * In all cases we only log if qemu_loglevel is set.
* Also: * Also:
* If not daemonized we will always log either to stderr * If not daemonized we will always log either to stderr
* or to a file (if there is a logfilename). * or to a file (if there is a filename).
* If we are daemonized, * If we are daemonized, we will only log if there is a filename.
* we will only log if there is a logfilename.
*/ */
need_to_open_file = log_flags && (!is_daemonized() || filename); need_to_open_file = log_flags && (!is_daemonized() || filename);