diff options
| -rw-r--r-- | audio/audio.c | 23 | ||||
| -rw-r--r-- | include/monitor/monitor.h | 1 | ||||
| -rw-r--r-- | monitor.c | 4 |
3 files changed, 3 insertions, 25 deletions
diff --git a/audio/audio.c b/audio/audio.c index 9d018e9ded..cb1cba9236 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -67,7 +67,6 @@ static struct { int64_t ticks; } period; int plive; - int log_to_monitor; int try_poll_in; int try_poll_out; } conf = { @@ -97,7 +96,6 @@ static struct { .period = { .hertz = 100 }, .plive = 0, - .log_to_monitor = 0, .try_poll_in = 1, .try_poll_out = 1, }; @@ -331,20 +329,11 @@ static const char *audio_get_conf_str (const char *key, void AUD_vlog (const char *cap, const char *fmt, va_list ap) { - if (conf.log_to_monitor) { - if (cap) { - monitor_printf(default_mon, "%s: ", cap); - } - - monitor_vprintf(default_mon, fmt, ap); + if (cap) { + fprintf(stderr, "%s: ", cap); } - else { - if (cap) { - fprintf (stderr, "%s: ", cap); - } - vfprintf (stderr, fmt, ap); - } + vfprintf(stderr, fmt, ap); } void AUD_log (const char *cap, const char *fmt, ...) @@ -1654,12 +1643,6 @@ static struct audio_option audio_options[] = { .valp = &conf.plive, .descr = "(undocumented)" }, - { - .name = "LOG_TO_MONITOR", - .tag = AUD_OPT_BOOL, - .valp = &conf.log_to_monitor, - .descr = "Print logging messages to monitor instead of stderr" - }, { /* End of list */ } }; diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 57f8394a94..88644ceda7 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -8,7 +8,6 @@ #include "qemu/readline.h" extern Monitor *cur_mon; -extern Monitor *default_mon; /* flags for monitor_init */ #define MONITOR_IS_DEFAULT 0x01 @@ -226,7 +226,6 @@ static mon_cmd_t info_cmds[]; static const mon_cmd_t qmp_cmds[]; Monitor *cur_mon; -Monitor *default_mon; static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque); @@ -5298,9 +5297,6 @@ void monitor_init(CharDriverState *chr, int flags) qemu_mutex_lock(&monitor_lock); QLIST_INSERT_HEAD(&mon_list, mon, entry); qemu_mutex_unlock(&monitor_lock); - - if (!default_mon || (flags & MONITOR_IS_DEFAULT)) - default_mon = mon; } static void bdrv_password_cb(void *opaque, const char *password, |