[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/39] util/log: Rename logfilename to global_filename
From: |
Richard Henderson |
Subject: |
[PULL 32/39] util/log: Rename logfilename to global_filename |
Date: |
Wed, 20 Apr 2022 11:06:11 -0700 |
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>
---
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;
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);
--
2.34.1
- [PULL 24/39] include/exec/log: Do not reference QemuLogFile directly, (continued)
- [PULL 24/39] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/20
- [PULL 23/39] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/20
- [PULL 21/39] bsd-user: Expand log_page_dump inline, Richard Henderson, 2022/04/20
- [PULL 25/39] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/04/20
- [PULL 22/39] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/04/20
- [PULL 27/39] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file, Richard Henderson, 2022/04/20
- [PULL 29/39] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 30/39] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 31/39] util/log: Remove qemu_log_close, Richard Henderson, 2022/04/20
- [PULL 32/39] util/log: Rename logfilename to global_filename,
Richard Henderson <=
- [PULL 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal, Richard Henderson, 2022/04/20
- [PULL 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 33/39] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/04/20
- [PULL 36/39] util/log: Combine two logfile closes, Richard Henderson, 2022/04/20
- [PULL 37/39] util/log: Rename QemuLogFile to RCUCloseFILE, Richard Henderson, 2022/04/20
- [PULL 38/39] util/log: Limit RCUCloseFILE to file closing, Richard Henderson, 2022/04/20
- [PULL 39/39] util/log: Support per-thread log files, Richard Henderson, 2022/04/20
- [PULL 34/39] util/log: Rename qemu_logfile_mutex to global_mutex, Richard Henderson, 2022/04/20
- Re: [PULL 00/39] Logging cleanup and per-thread logfiles, Richard Henderson, 2022/04/20