[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/17] monitor: Drop banner hiding
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 11/17] monitor: Drop banner hiding |
Date: |
Sat, 07 Feb 2009 19:16:29 +0100 |
User-agent: |
StGIT/0.14.2 |
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 c21ea8a..e187412 100644
--- a/monitor.c
+++ b/monitor.c
@@ -73,7 +73,6 @@ typedef struct MonitorTerm {
} MonitorTerm;
static LIST_HEAD(term_list, MonitorTerm) term_list;
-static int hide_banner;
static const term_cmd_t term_cmds[];
static const term_cmd_t info_cmds[];
@@ -2832,15 +2831,14 @@ static void term_event(void *opaque, int event)
if (event != CHR_EVENT_RESET)
return;
- if (!hide_banner)
- monitor_printf("QEMU %s monitor - type 'help' for more information\n",
- QEMU_VERSION);
+ monitor_printf("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)
{
MonitorTerm *term;
@@ -2851,8 +2849,6 @@ void monitor_init(CharDriverState *chr, int show_banner)
term = qemu_mallocz(sizeof(*term));
- hide_banner = !show_banner;
-
term->chr = chr;
qemu_chr_add_handlers(chr, term_can_read, term_read, term_event, NULL);
diff --git a/monitor.h b/monitor.h
index 226f76c..ae79a68 100644
--- a/monitor.h
+++ b/monitor.h
@@ -4,7 +4,7 @@
#include "qemu-char.h"
#include "block.h"
-void monitor_init(CharDriverState *chr, int show_banner);
+void monitor_init(CharDriverState *chr);
void monitor_suspend(void);
void monitor_resume(void);
diff --git a/qemu-char.c b/qemu-char.c
index 15cb931..5c2ee4e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2095,7 +2095,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 f8f049a..4b25080 100644
--- a/vl.c
+++ b/vl.c
@@ -5583,7 +5583,7 @@ int main(int argc, char **argv, char **envp)
text_consoles_set_display(display_state);
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];
- [Qemu-devel] [PATCH 14/17] monitor: Decouple terminals, (continued)
- [Qemu-devel] [PATCH 17/17] monitor: Pass-through for gdbstub, Jan Kiszka, 2009/02/07
- [Qemu-devel] [PATCH 13/17] monitor: Introduce ReadLineState, Jan Kiszka, 2009/02/07
- [Qemu-devel] [PATCH 07/17] monitor: Introduce monitor.h and readline.h, Jan Kiszka, 2009/02/07
- [Qemu-devel] [PATCH 12/17] monitor: Rework modal password input, Jan Kiszka, 2009/02/07
- [Qemu-devel] [PATCH 06/17] char-mux: Use separate input buffers, Jan Kiszka, 2009/02/07
- [Qemu-devel] [PATCH 11/17] monitor: Drop banner hiding,
Jan Kiszka <=