[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 12/16] Cleaned up flow of code in qemu_set_log(), to simplify
From: |
Alex Bennée |
Subject: |
[PATCH v1 12/16] Cleaned up flow of code in qemu_set_log(), to simplify and clarify. |
Date: |
Mon, 16 Dec 2019 11:07:28 +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>
---
util/log.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
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
- [PATCH v1 06/16] iotests: Skip test 079 if it is not possible to create large files, (continued)
- [PATCH v1 06/16] iotests: Skip test 079 if it is not possible to create large files, Alex Bennée, 2019/12/16
- [PATCH v1 07/16] tests/hd-geo-test: Skip test when images can not be created, Alex Bennée, 2019/12/16
- [PATCH v1 08/16] tests/test-util-filemonitor: Skip test on non-x86 Travis containers, Alex Bennée, 2019/12/16
- [PATCH v1 10/16] ci: build out-of-tree, Alex Bennée, 2019/12/16
- [PATCH v1 11/16] Fix double free issue in qemu_set_log_filename()., Alex Bennée, 2019/12/16
- [PATCH v1 09/16] travis.yml: Enable builds on arm64, ppc64le and s390x, Alex Bennée, 2019/12/16
- [PATCH v1 13/16] Add a mutex to guarantee single writer to qemu_logfile handle., Alex Bennée, 2019/12/16
- [PATCH v1 16/16] Added tests for close and change of logfile., Alex Bennée, 2019/12/16
- [PATCH v1 12/16] Cleaned up flow of code in qemu_set_log(), to simplify and clarify.,
Alex Bennée <=
- [PATCH v1 15/16] Add use of RCU for qemu_logfile., Alex Bennée, 2019/12/16
- [PATCH v1 14/16] qemu_log_lock/unlock now preserves the qemu_logfile handle., Alex Bennée, 2019/12/16