[Qemu-devel] [6713] monitor: Drop banner hiding (Jan Kiszka)

[Anthony Liguori]

Revision: 6713
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6713
Author:   aliguori
Date:     2009-03-05 23:01:33 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
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>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/monitor.c
    trunk/monitor.h
    trunk/qemu-char.c
    trunk/vl.c

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c     2009-03-05 23:01:29 UTC (rev 6712)
+++ trunk/monitor.c     2009-03-05 23:01:33 UTC (rev 6713)
@@ -73,7 +73,6 @@
 };
 
 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 @@
     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 @@
 
     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);

Modified: trunk/monitor.h
===================================================================
--- trunk/monitor.h     2009-03-05 23:01:29 UTC (rev 6712)
+++ trunk/monitor.h     2009-03-05 23:01:33 UTC (rev 6713)
@@ -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);

Modified: trunk/qemu-char.c
===================================================================
--- trunk/qemu-char.c   2009-03-05 23:01:29 UTC (rev 6712)
+++ trunk/qemu-char.c   2009-03-05 23:01:33 UTC (rev 6713)
@@ -2123,7 +2123,7 @@
         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);
         }

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-03-05 23:01:29 UTC (rev 6712)
+++ trunk/vl.c  2009-03-05 23:01:33 UTC (rev 6713)
@@ -5684,7 +5684,7 @@
     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];