mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/log: Rename qemu_logfile to global_file

Browse Source 
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-34-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 11:30:13 -07:00
parent 4226646481
commit 8ae58d6009
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/log.c
View File

@ -36,7 +36,7 @@ typedef struct QemuLogFile {
static char *global_filename; static char *global_filename;
static QemuMutex qemu_logfile_mutex; static QemuMutex qemu_logfile_mutex;
static QemuLogFile *qemu_logfile; static QemuLogFile *global_file;
int qemu_loglevel; int qemu_loglevel;
static int log_append = 0; static int log_append = 0;
static GArray *debug_regions; static GArray *debug_regions;
@ -44,7 +44,7 @@ static GArray *debug_regions;
/* Returns true if qemu_log() will really write somewhere. */ /* Returns true if qemu_log() will really write somewhere. */
bool qemu_log_enabled(void) bool qemu_log_enabled(void)
{ {
return qemu_logfile != NULL; return global_file != NULL;
} }
/* Returns true if qemu_log() will write somewhere other than stderr. */ /* Returns true if qemu_log() will write somewhere other than stderr. */
@ -54,7 +54,7 @@ bool qemu_log_separate(void)
bool res = false; bool res = false;
rcu_read_lock(); rcu_read_lock();
logfile = qatomic_rcu_read(&qemu_logfile); logfile = qatomic_rcu_read(&global_file);
if (logfile && logfile->fd != stderr) { if (logfile && logfile->fd != stderr) {
res = true; res = true;
} }
@ -69,7 +69,7 @@ FILE *qemu_log_trylock(void)
QemuLogFile *logfile; QemuLogFile *logfile;
rcu_read_lock(); rcu_read_lock();
logfile = qatomic_rcu_read(&qemu_logfile); logfile = qatomic_rcu_read(&global_file);
if (logfile) { if (logfile) {
qemu_flockfile(logfile->fd); qemu_flockfile(logfile->fd);
return logfile->fd; return logfile->fd;
@ -124,7 +124,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
QemuLogFile *logfile; QemuLogFile *logfile;
QEMU_LOCK_GUARD(&qemu_logfile_mutex); QEMU_LOCK_GUARD(&qemu_logfile_mutex);
logfile = qemu_logfile; logfile = global_file;
if (changed_name) { if (changed_name) {
char *newname = NULL; char *newname = NULL;
@ -156,7 +156,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
filename = newname; filename = newname;
if (logfile) { if (logfile) {
qatomic_rcu_set(&qemu_logfile, NULL); qatomic_rcu_set(&global_file, NULL);
call_rcu(logfile, qemu_logfile_free, rcu); call_rcu(logfile, qemu_logfile_free, rcu);
logfile = NULL; logfile = NULL;
} }
@ -179,7 +179,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
need_to_open_file = log_flags && (!is_daemonized() || filename); need_to_open_file = log_flags && (!is_daemonized() || filename);
if (logfile && !need_to_open_file) { if (logfile && !need_to_open_file) {
qatomic_rcu_set(&qemu_logfile, NULL); qatomic_rcu_set(&global_file, NULL);
call_rcu(logfile, qemu_logfile_free, rcu); call_rcu(logfile, qemu_logfile_free, rcu);
return true; return true;
} }
@ -210,7 +210,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
logfile = g_new0(QemuLogFile, 1); logfile = g_new0(QemuLogFile, 1);
logfile->fd = fd; logfile->fd = fd;
qatomic_rcu_set(&qemu_logfile, logfile); qatomic_rcu_set(&global_file, logfile);
} }
return true; return true;
} }