[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/25] Cleaned up flow of code in qemu_set_log(), to simplify and
From: |
Alex Bennée |
Subject: |
[PULL 12/25] Cleaned up flow of code in qemu_set_log(), to simplify and clarify. |
Date: |
Thu, 19 Dec 2019 10:49:21 +0000 |
From: Robert Foley <address@hidden>
Also added some explanation of the reasoning behind the branches.
Signed-off-by: Robert Foley <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
diff --git a/util/log.c b/util/log.c
index 4316fe74eee..417d16ec66e 100644
--- a/util/log.c
+++ b/util/log.c
@@ -54,12 +54,25 @@ static bool log_uses_own_buffers;
/* enable or disable low levels log */
void qemu_set_log(int log_flags)
{
+ bool need_to_open_file = false;
qemu_loglevel = log_flags;
#ifdef CONFIG_TRACE_LOG
qemu_loglevel |= LOG_TRACE;
#endif
- if (!qemu_logfile &&
- (is_daemonized() ? logfilename != NULL : qemu_loglevel)) {
+ /*
+ * 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.
+ */
+ if (qemu_loglevel && (!is_daemonized() || logfilename)) {
+ need_to_open_file = true;
+ }
+ if (qemu_logfile && !need_to_open_file) {
+ qemu_log_close();
+ } else if (!qemu_logfile && need_to_open_file) {
if (logfilename) {
qemu_logfile = fopen(logfilename, log_append ? "a" : "w");
if (!qemu_logfile) {
@@ -93,10 +106,6 @@ void qemu_set_log(int log_flags)
log_append = 1;
}
}
- if (qemu_logfile &&
- (is_daemonized() ? logfilename == NULL : !qemu_loglevel)) {
- qemu_log_close();
- }
}
void qemu_log_needs_buffers(void)
--
2.20.1
- [PULL 03/25] travis.yml: Run tcg tests with tci, (continued)
- [PULL 03/25] travis.yml: Run tcg tests with tci, Alex Bennée, 2019/12/19
- [PULL 02/25] tests/vm: Allow to set qemu-img path, Alex Bennée, 2019/12/19
- [PULL 04/25] iotests: Provide a function for checking the creation of huge files, Alex Bennée, 2019/12/19
- [PULL 05/25] iotests: Skip test 060 if it is not possible to create large files, Alex Bennée, 2019/12/19
- [PULL 06/25] iotests: Skip test 079 if it is not possible to create large files, Alex Bennée, 2019/12/19
- [PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers, Alex Bennée, 2019/12/19
- [PULL 09/25] travis.yml: Enable builds on arm64, ppc64le and s390x, Alex Bennée, 2019/12/19
- [PULL 07/25] tests/hd-geo-test: Skip test when images can not be created, Alex Bennée, 2019/12/19
- [PULL 10/25] ci: build out-of-tree, Alex Bennée, 2019/12/19
- [PULL 11/25] Fix double free issue in qemu_set_log_filename()., Alex Bennée, 2019/12/19
- [PULL 12/25] Cleaned up flow of code in qemu_set_log(), to simplify and clarify.,
Alex Bennée <=
- [PULL 13/25] Add a mutex to guarantee single writer to qemu_logfile handle., Alex Bennée, 2019/12/19
- [PULL 18/25] travis.yml: Remove the redundant clang-with-MAIN_SOFTMMU_TARGETS entry, Alex Bennée, 2019/12/19
- [PULL 21/25] linux-user: add target_mmap_complete tracepoint, Alex Bennée, 2019/12/19
- [PULL 15/25] Add use of RCU for qemu_logfile., Alex Bennée, 2019/12/19
- [PULL 20/25] linux-user: convert target_mmap debug to tracepoint, Alex Bennée, 2019/12/19
- [PULL 17/25] docker: gtester is no longer used, Alex Bennée, 2019/12/19
- [PULL 19/25] linux-user: convert target_mprotect debug to tracepoint, Alex Bennée, 2019/12/19
- [PULL 16/25] Added tests for close and change of logfile., Alex Bennée, 2019/12/19
- [PULL 25/25] tests/tcg: ensure we re-configure if configure.sh is updated, Alex Bennée, 2019/12/19
- [PULL 24/25] trace: replace hand-crafted pattern_glob with g_pattern_match_simple, Alex Bennée, 2019/12/19