[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] qemu_set_log_filename: filename argument may be NULL
From: |
Stefan Hajnoczi |
Subject: |
[PULL 5/5] qemu_set_log_filename: filename argument may be NULL |
Date: |
Thu, 30 Jan 2020 21:38:14 +0000 |
From: Salvador Fandino <address@hidden>
NULL is a valid log filename used to indicate we want to use stderr
but qemu_set_log_filename (which is called by bsd-user/main.c) was not
handling it correctly.
That also made redundant a couple of NULL checks in calling code which
have been removed.
Signed-off-by: Salvador Fandino <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
trace/control.c | 4 +---
util/log.c | 28 ++++++++++++++++------------
vl.c | 5 +----
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/trace/control.c b/trace/control.c
index 0fb8124160..6c775e68eb 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -229,9 +229,7 @@ void trace_init_file(const char *file)
/* If both the simple and the log backends are enabled, "--trace file"
* only applies to the simple backend; use "-D" for the log backend.
*/
- if (file) {
- qemu_set_log_filename(file, &error_fatal);
- }
+ qemu_set_log_filename(file, &error_fatal);
#else
if (file) {
fprintf(stderr, "error: --trace file=...: "
diff --git a/util/log.c b/util/log.c
index 867264da8d..47f2827397 100644
--- a/util/log.c
+++ b/util/log.c
@@ -148,25 +148,29 @@ void qemu_log_needs_buffers(void)
* Allow the user to include %d in their logfile which will be
* substituted with the current PID. This is useful for debugging many
* nested linux-user tasks but will result in lots of logs.
+ *
+ * filename may be NULL. In that case, log output is sent to stderr
*/
void qemu_set_log_filename(const char *filename, Error **errp)
{
- char *pidstr;
g_free(logfilename);
logfilename = NULL;
- pidstr = strstr(filename, "%");
- if (pidstr) {
- /* We only accept one %d, no other format strings */
- if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
- error_setg(errp, "Bad logfile format: %s", filename);
- return;
- } else {
- logfilename = g_strdup_printf(filename, getpid());
- }
- } else {
- logfilename = g_strdup(filename);
+ if (filename) {
+ char *pidstr = strstr(filename, "%");
+ if (pidstr) {
+ /* We only accept one %d, no other format strings */
+ if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
+ error_setg(errp, "Bad logfile format: %s", filename);
+ return;
+ } else {
+ logfilename = g_strdup_printf(filename, getpid());
+ }
+ } else {
+ logfilename = g_strdup(filename);
+ }
}
+
qemu_log_close();
qemu_set_log(qemu_loglevel);
}
diff --git a/vl.c b/vl.c
index 24951b51a9..7dcb0879c4 100644
--- a/vl.c
+++ b/vl.c
@@ -3903,10 +3903,7 @@ int main(int argc, char **argv, char **envp)
/* Open the logfile at this point and set the log mask if necessary.
*/
- if (log_file) {
- qemu_set_log_filename(log_file, &error_fatal);
- }
-
+ qemu_set_log_filename(log_file, &error_fatal);
if (log_mask) {
int mask;
mask = qemu_str_to_log_mask(log_mask);
--
2.24.1
- [PULL 0/5] Tracing patches, Stefan Hajnoczi, 2020/01/30
- [PULL 1/5] Makefile: Keep trace-events-subdirs ordered, Stefan Hajnoczi, 2020/01/30
- [PULL 2/5] docs/devel/tracing.txt: Recommend only trace_event_get_state_backends(), Stefan Hajnoczi, 2020/01/30
- [PULL 4/5] hw/display/qxl.c: Use trace_event_get_state_backends(), Stefan Hajnoczi, 2020/01/30
- [PULL 3/5] memory.c: Use trace_event_get_state_backends(), Stefan Hajnoczi, 2020/01/30
- [PULL 5/5] qemu_set_log_filename: filename argument may be NULL,
Stefan Hajnoczi <=
- Re: [PULL 0/5] Tracing patches, Peter Maydell, 2020/01/31
- Re: [PULL 0/5] Tracing patches, Peter Maydell, 2020/01/31