[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 34/39] util/log: Rename qemu_logfile_mutex to global_mutex
From: |
Richard Henderson |
Subject: |
[PATCH v3 34/39] util/log: Rename qemu_logfile_mutex to global_mutex |
Date: |
Sun, 17 Apr 2022 11:30:14 -0700 |
Rename to emphasize this covers the file-scope global variables.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
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 425f0064b0..bb201664ac 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;
@@ -101,9 +103,9 @@ void qemu_log(const char *fmt, ...)
}
}
-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)
@@ -123,7 +125,7 @@ static bool 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
- [PATCH v3 30/39] softmmu: Use qemu_set_log_filename_flags, (continued)
- [PATCH v3 30/39] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 31/39] util/log: Remove qemu_log_close, Richard Henderson, 2022/04/17
- [PATCH v3 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/04/17
- [PATCH v3 04/39] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/04/17
- [PATCH v3 15/39] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/04/17
- [PATCH v3 24/39] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/17
- [PATCH v3 29/39] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal, Richard Henderson, 2022/04/17
- [PATCH v3 34/39] util/log: Rename qemu_logfile_mutex to global_mutex,
Richard Henderson <=
- [PATCH v3 36/39] util/log: Combine two logfile closes, Richard Henderson, 2022/04/17
- [PATCH v3 39/39] util/log: Support per-thread log files, Richard Henderson, 2022/04/17
- [PATCH v3 38/39] util/log: Limit RCUCloseFILE to file closing, Richard Henderson, 2022/04/17
- [PATCH v3 33/39] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/04/17
- [PATCH v3 12/39] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/04/17
- [PATCH v3 18/39] util/log: Mark qemu_log_trylock as G_GNUC_WARN_UNUSED_RESULT, Richard Henderson, 2022/04/17