aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-04-17 11:30:14 -0700
committerRichard Henderson <richard.henderson@linaro.org>2022-04-20 10:51:11 -0700
commit702979f736a13aded68b7a14a46a7b33b752cce5 (patch)
treea7768fb26e7b312226c3340248be6f86fcdb5ea8 /util
parent8ae58d60096ee1ba1436229b49abdabecc3f5c62 (diff)
util/log: Rename qemu_logfile_mutex to global_mutex
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> Message-Id: <20220417183019.755276-35-richard.henderson@linaro.org>
Diffstat (limited to 'util')
-rw-r--r--util/log.c10
1 files 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) {