| Message ID | 20220326132534.543738-41-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Logging cleanup and per-thread logfiles | expand |
Richard Henderson <richard.henderson@linaro.org> writes: > Rename to emphasize this is the file-scope global variable. > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > util/log.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/util/log.c b/util/log.c > index 491a8f97f9..b3f79deb6c 100644 > --- a/util/log.c > +++ b/util/log.c > @@ -34,7 +34,7 @@ typedef struct QemuLogFile { > FILE *fd; > } QemuLogFile; > > -static char *logfilename; > +static char *global_filename; > static QemuMutex qemu_logfile_mutex; > static QemuLogFile *qemu_logfile; > int qemu_loglevel; > @@ -151,8 +151,8 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, > } > } > > - g_free(logfilename); > - logfilename = newname; > + g_free(global_filename); > + global_filename = newname; > filename = newname; I guess there is no conceivable failure mode in which we get a torn pointer without qatomic_set? Anyway: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
On 4/14/22 08:18, Alex Bennée wrote: > > Richard Henderson <richard.henderson@linaro.org> writes: > >> Rename to emphasize this is the file-scope global variable. >> >> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> util/log.c | 13 ++++++------- >> 1 file changed, 6 insertions(+), 7 deletions(-) >> >> diff --git a/util/log.c b/util/log.c >> index 491a8f97f9..b3f79deb6c 100644 >> --- a/util/log.c >> +++ b/util/log.c >> @@ -34,7 +34,7 @@ typedef struct QemuLogFile { >> FILE *fd; >> } QemuLogFile; >> >> -static char *logfilename; >> +static char *global_filename; >> static QemuMutex qemu_logfile_mutex; >> static QemuLogFile *qemu_logfile; >> int qemu_loglevel; >> @@ -151,8 +151,8 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, >> } >> } >> >> - g_free(logfilename); >> - logfilename = newname; >> + g_free(global_filename); >> + global_filename = newname; >> filename = newname; > > I guess there is no conceivable failure mode in which we get a torn > pointer without qatomic_set? No. Word-sized quantities like pointers will never tear. Although what this comment has to do with a renaming, I don't know. r~ > > Anyway: > > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >
diff --git a/util/log.c b/util/log.c index 491a8f97f9..b3f79deb6c 100644 --- a/util/log.c +++ b/util/log.c @@ -34,7 +34,7 @@ typedef struct QemuLogFile { FILE *fd; } QemuLogFile; -static char *logfilename; +static char *global_filename; static QemuMutex qemu_logfile_mutex; static QemuLogFile *qemu_logfile; int qemu_loglevel; @@ -151,8 +151,8 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, } } - g_free(logfilename); - logfilename = newname; + g_free(global_filename); + global_filename = newname; filename = newname; if (logfile) { @@ -161,7 +161,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, logfile = NULL; } } else { - filename = logfilename; + filename = global_filename; } #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. * Also: * If not daemonized we will always log either to stderr - * or to a file (if there is a logfilename). - * If we are daemonized, - * we will only log if there is a logfilename. + * or to a file (if there is a filename). + * If we are daemonized, we will only log if there is a filename. */ need_to_open_file = log_flags && (!is_daemonized() || filename);