qemu_set_log_filename: filename argument may be NULL
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 <salvador@qindel.com> Message-Id: <20200123193626.19956-1-salvador@qindel.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
d4aceb2eb7
commit
e144a605a6
|
@ -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);
|
||||
}
|
||||
#else
|
||||
if (file) {
|
||||
fprintf(stderr, "error: --trace file=...: "
|
||||
|
|
|
@ -148,14 +148,16 @@ 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 (filename) {
|
||||
char *pidstr = strstr(filename, "%");
|
||||
if (pidstr) {
|
||||
/* We only accept one %d, no other format strings */
|
||||
if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
|
||||
|
@ -167,6 +169,8 @@ void qemu_set_log_filename(const char *filename, Error **errp)
|
|||
} else {
|
||||
logfilename = g_strdup(filename);
|
||||
}
|
||||
}
|
||||
|
||||
qemu_log_close();
|
||||
qemu_set_log(qemu_loglevel);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue