serial console

3 files changed, 10 insertions, 1 deletions

diff --git a/monitor.c b/monitor.c
index 6697d04..b626593 100644
--- a/monitor.c
+++ b/monitor.c
@@ -90,6 +90,8 @@ static int monitor_parse(struct qemu_window *win, char *buf, int len)
 
     } else if (0 == strcmp(cmd, "info chardev")) {
         devices_parse_info_chardev(win, reply);
+        if (win->sercon_tab && win->sercon)
+            conn_open_term(win, "serial0", win->sercon, 0);
 
     } else if (0 == strcmp(cmd, "info vnc")) {
         if (1 == sscanf(reply, "VNC server active on: %127[^\r\n]",
diff --git a/qemu-gtk.c b/qemu-gtk.c
index 4c456ea..51c3bad 100644
--- a/qemu-gtk.c
+++ b/qemu-gtk.c
@@ -937,6 +937,7 @@ static void usage(FILE *fp)
 	    "   -d          Raise debug level.\n"
 	    "   -k          Keep window open on VM shutdown.\n"
 	    "   -m          Enable monitor logging and access.\n"
+	    "   -s          Show serial console.\n"
 	    "\n"
 	    "-- \n"
 	    "(c) 2008 Gerd Hoffmann <kraxel@redhat.com>\n",
@@ -948,12 +949,13 @@ main(int argc, char *argv[])
 {
     struct qemu_window *win;
     int monitor_tab = 0;
+    int sercon_tab = 0;
     int quit_on_shutdown = 1;
     int c;
 
     gtk_init(&argc, &argv);
     for (;;) {
-        if (-1 == (c = getopt(argc, argv, "hdkm")))
+        if (-1 == (c = getopt(argc, argv, "hdkms")))
             break;
         switch (c) {
 	case 'd':
@@ -965,6 +967,9 @@ main(int argc, char *argv[])
         case 'm':
             monitor_tab++;
             break;
+        case 's':
+            sercon_tab++;
+            break;
         case 'h':
             usage(stdout);
             exit(0);
@@ -988,6 +993,7 @@ main(int argc, char *argv[])
         exit(1);
     }
     win->quit_on_shutdown = quit_on_shutdown;
+    win->sercon_tab = sercon_tab;
     gtk_widget_show_all(win->toplevel);
 
     /* tabs */
diff --git a/qemu-gtk.h b/qemu-gtk.h
index 702e984..7af4f80 100644
--- a/qemu-gtk.h
+++ b/qemu-gtk.h
@@ -75,6 +75,7 @@ struct qemu_window {
 
     /* options */
     gboolean         quit_on_shutdown;
+    gboolean         sercon_tab;
     gboolean         vnc_scale;
     gboolean         vnc_grab_mouse;
     gboolean         vnc_grab_kbd;