From bb806047e22f20b96fc4f2e1a8c93bfe16e552d7 Mon Sep 17 00:00:00 2001
From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 5 Mar 2009 23:01:33 +0000
Subject: [PATCH] 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
---
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 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);
diff --git a/monitor.h b/monitor.h
index d06e2d8bba..abe7193d75 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 d4ff367ebb..bb5033761c 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 307d884d35..cea0ddd3f7 100644
--- a/vl.c
+++ b/vl.c
@@ -5684,7 +5684,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];