[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 32/36] util/log: Hoist the eval of is_daemonized in qemu_s
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 32/36] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal |
Date: |
Sun, 20 Mar 2022 10:11:31 -0700 |
Only call is_daemonized once.
We require the result on all paths after this point.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
util/log.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/util/log.c b/util/log.c
index 42b13e6bf1..f1f6d09c90 100644
--- a/util/log.c
+++ b/util/log.c
@@ -132,6 +132,7 @@ static void qemu_set_log_internal(const char *filename,
bool changed_name,
int log_flags, Error **errp)
{
bool need_to_open_file;
+ bool daemonized;
QemuLogFile *logfile;
QEMU_LOCK_GUARD(&global_mutex);
@@ -187,7 +188,8 @@ static void qemu_set_log_internal(const char *filename,
bool changed_name,
* 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);
+ daemonized = is_daemonized();
+ need_to_open_file = log_flags && (!daemonized || filename);
if (logfile && !need_to_open_file) {
qatomic_rcu_set(&global_file, NULL);
@@ -205,7 +207,7 @@ static void qemu_set_log_internal(const char *filename,
bool changed_name,
return;
}
/* In case we are a daemon redirect stderr to logfile */
- if (is_daemonized()) {
+ if (daemonized) {
dup2(fileno(fd), STDERR_FILENO);
fclose(fd);
/* This will skip closing logfile in qemu_logfile_free. */
@@ -213,7 +215,7 @@ static void qemu_set_log_internal(const char *filename,
bool changed_name,
}
} else {
/* Default to stderr if no log file specified */
- assert(!is_daemonized());
+ assert(!daemonized);
fd = stderr;
}
--
2.25.1
- [PULL for-7.1 21/36] include/exec/log: Do not reference QemuLogFile directly, (continued)
- [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, 2022/03/20
- [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 <=
- [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