[Qemu-devel] [PATCH v2 14/19] 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 <address@hidden>
---

 monitor.c   |   10 +++-------
 monitor.h   |    2 +-
 qemu-char.c |    2 +-
 vl.c        |    2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/monitor.c b/monitor.c
index dad9c66..3115a67 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[];
@@ -2886,15 +2885,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;
 
@@ -2905,8 +2903,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);
diff --git a/monitor.h b/monitor.h
index d06e2d8..abe7193 100644
--- a/monitor.h
+++ b/monitor.h
@@ -7,7 +7,7 @@
 
 extern Monitor *cur_mon;
 
-void monitor_init(CharDriverState *chr, int show_banner);
+void monitor_init(CharDriverState *chr);
 
 void monitor_suspend(Monitor *mon);
 void monitor_resume(Monitor *mon);
diff --git a/qemu-char.c b/qemu-char.c
index d4ff367..bb50337 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2123,7 +2123,7 @@ CharDriverState *qemu_chr_open(const char *label, const 
char *filename, void (*i
         chr = qemu_chr_open(label, p, NULL);
         if (chr) {
             chr = qemu_chr_open_mux(chr);
-            monitor_init(chr, !nographic);
+            monitor_init(chr);
         } else {
             printf("Unable to open driver: %s\n", p);
         }
diff --git a/vl.c b/vl.c
index 1de2f00..bbf96e0 100644
--- a/vl.c
+++ b/vl.c
@@ -5658,7 +5658,7 @@ int main(int argc, char **argv, char **envp)
     qemu_chr_initial_reset();
 
     if (monitor_device && monitor_hd)
-        monitor_init(monitor_hd, !nographic);
+        monitor_init(monitor_hd);
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         const char *devname = serial_devices[i];