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 /linux-user | |
| parent | bd6fee9f1263dc5ba487c7ac57d33a727af63c00 (diff) | |
| download | qemu-daa76aa416b1e18ab1fac650ff53d966d8f21f68.zip qemu-daa76aa416b1e18ab1fac650ff53d966d8f21f68.tar.gz qemu-daa76aa416b1e18ab1fac650ff53d966d8f21f68.tar.bz2 | |
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 'linux-user')
| -rw-r--r-- | linux-user/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index b9a4e0e..358ed01 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -21,6 +21,7 @@ #include <sys/syscall.h> #include <sys/resource.h> +#include "qapi/error.h" #include "qemu.h" #include "qemu/path.h" #include "qemu/cutils.h" @@ -3845,7 +3846,7 @@ static void handle_arg_log(const char *arg) static void handle_arg_log_filename(const char *arg) { - qemu_set_log_filename(arg); + qemu_set_log_filename(arg, &error_fatal); } static void handle_arg_set_env(const char *arg) |