diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-06-15 19:27:16 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-06-20 16:39:08 +0200 |
| commit | daa76aa416b1e18ab1fac650ff53d966d8f21f68 (patch) | |
| tree | a906532b58132857a76f8979b04dd6869b5e69d5 /util | |
| parent | bd6fee9f1263dc5ba487c7ac57d33a727af63c00 (diff) | |
| download | qemu-daa76aa416b1e18ab1fac650ff53d966d8f21f68.zip | |
log: Fix qemu_set_log_filename() error handling
When qemu_set_log_filename() detects an invalid file name, it reports
an error, closes the log file (if any), and starts logging to stderr
(unless daemonized or nothing is being logged).
This is wrong. Asking for an invalid log file on the command line
should be fatal. Asking for one in the monitor should fail without
messing up an existing logfile.
Fix by converting qemu_set_log_filename() to Error. Pass it
&error_fatal, except for hmp_logfile report errors.
This also permits testing without a subprocess, so do that.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1466011636-6112-4-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/log.c b/util/log.c index fcf85c6253..32e416051c 100644 --- a/util/log.c +++ b/util/log.c @@ -103,7 +103,7 @@ void qemu_log_needs_buffers(void) * substituted with the current PID. This is useful for debugging many * nested linux-user tasks but will result in lots of logs. */ -void qemu_set_log_filename(const char *filename) +void qemu_set_log_filename(const char *filename, Error **errp) { char *pidstr; g_free(logfilename); @@ -112,8 +112,8 @@ void qemu_set_log_filename(const char *filename) if (pidstr) { /* We only accept one %d, no other format strings */ if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) { - error_report("Bad logfile format: %s", filename); - logfilename = NULL; + error_setg(errp, "Bad logfile format: %s", filename); + return; } else { logfilename = g_strdup_printf(filename, getpid()); } |