qemu-log: Remove qemu_log_try_set_file() and its users Remove the function qemu_log_try_set_file() and its users (which are all in TCG code generation functions for various targets). This function was added to abstract out code which was originally written as "if (!logfile) logfile = stderr;" in order that BUG: case code which did an unguarded "fprintf(logfile, ...)" would not crash if debug logging was not enabled. Since those direct uses of logfile have also been abstracted away into qemu_log() calls which check for a NULL logfile, there is no need for the target-* files to mess with the user's chosen logging settings. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Andreas Färber <afaerber@suse.de> Acked-by: Michael Walle <michael@walle.cc> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
diff --git a/include/qemu/log.h b/include/qemu/log.h index 5a46555..4527003 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h
@@ -126,14 +126,6 @@ qemu_logfile = f; } -/* Set up a new log file, only if none is set */ -static inline void qemu_log_try_set_file(FILE *f) -{ - if (!qemu_logfile) { - qemu_logfile = f; - } -} - /* define log items */ typedef struct QEMULogItem { int mask;
diff --git a/target-cris/translate.c b/target-cris/translate.c index 04a5379..2cf01a5 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c
@@ -3215,8 +3215,6 @@ int num_insns; int max_insns; - qemu_log_try_set_file(stderr); - if (env->pregs[PR_VR] == 32) { dc->decoder = crisv32_decoder; dc->clear_locked_irq = 0;
diff --git a/target-lm32/translate.c b/target-lm32/translate.c index 6b87340..ccaf838 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c
@@ -1012,8 +1012,6 @@ int num_insns; int max_insns; - qemu_log_try_set_file(stderr); - pc_start = tb->pc; dc->env = env; dc->tb = tb;
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 12ea820..687b7d1 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c
@@ -1734,8 +1734,6 @@ int num_insns; int max_insns; - qemu_log_try_set_file(stderr); - pc_start = tb->pc; dc->env = env; dc->tb = tb;
diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index 1e1b30c..23e853e 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c
@@ -1670,8 +1670,6 @@ int num_insns; int max_insns; - qemu_log_try_set_file(stderr); - pc_start = tb->pc; dc->tb = tb;