[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 31/36] util/log: Rename qemu_logfile_mutex to global_mutex
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 31/36] util/log: Rename qemu_logfile_mutex to global_mutex |
Date: |
Sun, 20 Mar 2022 10:11:30 -0700 |
Rename to emphasize this covers the file-scope global variables.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
util/log.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/util/log.c b/util/log.c
index 0676ce5bd6..42b13e6bf1 100644
--- a/util/log.c
+++ b/util/log.c
@@ -34,9 +34,11 @@ typedef struct QemuLogFile {
FILE *fd;
} QemuLogFile;
+/* Mutex covering the other global_* variables. */
+static QemuMutex global_mutex;
static char *global_filename;
-static QemuMutex qemu_logfile_mutex;
static QemuLogFile *global_file;
+
int qemu_loglevel;
static int log_append = 0;
static GArray *debug_regions;
@@ -110,9 +112,9 @@ int qemu_log(const char *fmt, ...)
return ret;
}
-static void __attribute__((__constructor__)) qemu_logfile_init(void)
+static void __attribute__((__constructor__)) startup(void)
{
- qemu_mutex_init(&qemu_logfile_mutex);
+ qemu_mutex_init(&global_mutex);
}
static void qemu_logfile_free(QemuLogFile *logfile)
@@ -132,7 +134,7 @@ static void qemu_set_log_internal(const char *filename,
bool changed_name,
bool need_to_open_file;
QemuLogFile *logfile;
- QEMU_LOCK_GUARD(&qemu_logfile_mutex);
+ QEMU_LOCK_GUARD(&global_mutex);
logfile = global_file;
if (changed_name) {
--
2.25.1
- [PULL for-7.1 18/36] bsd-user: Expand log_page_dump inline, (continued)
- [PULL for-7.1 18/36] bsd-user: Expand log_page_dump inline, Richard Henderson, 2022/03/20
- [PULL for-7.1 19/36] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/03/20
- [PULL for-7.1 17/36] util/log: Drop call to setvbuf, Richard Henderson, 2022/03/20
- [PULL for-7.1 21/36] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/03/20
- [PULL for-7.1 22/36] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/03/20
- [PULL for-7.1 24/36] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 23/36] sysemu/os-win32: Test for and use _lock_file/_unlock_file, Richard Henderson, 2022/03/20
- [PULL for-7.1 26/36] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 27/36] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 28/36] util/log: Remove qemu_log_close, Richard Henderson, 2022/03/20
- [PULL for-7.1 31/36] util/log: Rename qemu_logfile_mutex to global_mutex,
Richard Henderson <=
- [PULL for-7.1 33/36] util/log: Combine two logfile closes, Richard Henderson, 2022/03/20
- [PULL for-7.1 35/36] util/log: Limit RCUCloseFILE to file closing, Richard Henderson, 2022/03/20
- [PULL for-7.1 32/36] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal, Richard Henderson, 2022/03/20
- [PULL for-7.1 36/36] util/log: Support per-thread log files, Richard Henderson, 2022/03/20
- [PULL for-7.1 34/36] util/log: Rename QemuLogFile to RCUCloseFILE, Richard Henderson, 2022/03/20
- Re: [PULL for-7.1 00/36] Logging cleanup and per-thread logfiles, Richard Henderson, 2022/03/20