Reinitialize monitor upon reconnect, by Anthony Liguori.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2300 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/monitor.c b/monitor.c
index da9b492..6cb1c38 100644
--- a/monitor.c
+++ b/monitor.c
@@ -55,6 +55,7 @@
} term_cmd_t;
static CharDriverState *monitor_hd;
+static int hide_banner;
static term_cmd_t term_cmds[];
static term_cmd_t info_cmds[];
@@ -2438,15 +2439,24 @@
readline_start("(qemu) ", 0, monitor_handle_command1, NULL);
}
+static void term_event(void *opaque, int event)
+{
+ if (event != CHR_EVENT_RESET)
+ return;
+
+ if (!hide_banner)
+ term_printf("QEMU %s monitor - type 'help' for more information\n",
+ QEMU_VERSION);
+ monitor_start_input();
+}
+
void monitor_init(CharDriverState *hd, int show_banner)
{
monitor_hd = hd;
- if (show_banner) {
- term_printf("QEMU %s monitor - type 'help' for more information\n",
- QEMU_VERSION);
- }
+ hide_banner = !show_banner;
+
qemu_chr_add_read_handler(hd, term_can_read, term_read, NULL);
- monitor_start_input();
+ qemu_chr_add_event_handler(hd, term_event);
}
/* XXX: use threads ? */