monitor: Drop banner hiding (Jan Kiszka)

There is no use for the hide/show banner option, and it is applied
inconsistently anyway (or what makes the difference between
 -serial mon:stdio and -nographic for the monitor?). So drop this mode.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6713 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 3 insertions, 7 deletions

diff --git a/monitor.c b/monitor.c
index 62105b0208..d54fc88c5e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -73,7 +73,6 @@ struct Monitor {
 };
 
 static LIST_HEAD(mon_list, Monitor) mon_list;
-static int hide_banner;
 
 static const mon_cmd_t mon_cmds[];
 static const mon_cmd_t info_cmds[];
@@ -2917,15 +2916,14 @@ static void term_event(void *opaque, int event)
     if (event != CHR_EVENT_RESET)
 	return;
 
-    if (!hide_banner)
-        monitor_printf(mon, "QEMU %s monitor - type 'help' for more "
-                       "information\n", QEMU_VERSION);
+    monitor_printf(mon, "QEMU %s monitor - type 'help' for more information\n",
+                   QEMU_VERSION);
     monitor_start_input();
 }
 
 static int is_first_init = 1;
 
-void monitor_init(CharDriverState *chr, int show_banner)
+void monitor_init(CharDriverState *chr)
 {
     Monitor *mon;
 
@@ -2936,8 +2934,6 @@ void monitor_init(CharDriverState *chr, int show_banner)
 
     mon = qemu_mallocz(sizeof(*mon));
 
-    hide_banner = !show_banner;
-
     mon->chr = chr;
 
     qemu_chr_add_handlers(chr, term_can_read, term_read, term_event, mon);