commit 86e94dea5b740dad65446c857f6959eae43e0ba6
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Jan 05 22:01:59 2007 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Jan 05 22:01:59 2007 +0000
tree 7870bef3144c93a02c99751d7653d8492c1f2282
parent 8f28f3fbbe1116c5f4f11ebf4167a770032e2606

Reinitialize monitor upon reconnect, by Anthony Liguori.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2300 c046a42c-6fe2-441c-8c8c-71466251a162

vl.c

diff --git a/vl.c b/vl.c
index 7b3d880..e5399c7 100644
--- a/vl.c
+++ b/vl.c
@@ -1165,6 +1165,23 @@
 /***********************************************************/
 /* character device */
 
+static void qemu_chr_reset_bh(void *opaque)
+{
+    CharDriverState *s = opaque;
+    if (s->chr_event)
+	s->chr_event(s, CHR_EVENT_RESET);
+    qemu_bh_delete(s->bh);
+    s->bh = NULL;
+}
+
+void qemu_chr_reset(CharDriverState *s)
+{
+    if (s->bh == NULL) {
+	s->bh = qemu_bh_new(qemu_chr_reset_bh, s);
+	qemu_bh_schedule(s->bh);
+    }
+}
+
 int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len)
 {
     return s->chr_write(s, buf, len);
@@ -1402,6 +1419,9 @@
     chr->opaque = s;
     chr->chr_write = fd_chr_write;
     chr->chr_add_read_handler = fd_chr_add_read_handler;
+
+    qemu_chr_reset(chr);
+
     return chr;
 }
 
@@ -1819,6 +1839,7 @@
     if (!chr)
         return NULL;
     chr->chr_ioctl = tty_serial_ioctl;
+    qemu_chr_reset(chr);
     return chr;
 }
 
@@ -1882,6 +1903,9 @@
     chr->chr_write = null_chr_write;
     chr->chr_add_read_handler = null_chr_add_read_handler;
     chr->chr_ioctl = pp_ioctl;
+
+    qemu_chr_reset(chr);
+
     return chr;
 }
 
@@ -2127,6 +2151,7 @@
         free(chr);
         return NULL;
     }
+    qemu_chr_reset(chr);
     return chr;
 }
 
@@ -2230,6 +2255,7 @@
         free(chr);
         return NULL;
     }
+    qemu_chr_reset(chr);
     return chr;
 }
 
@@ -2250,6 +2276,7 @@
     chr->opaque = s;
     chr->chr_write = win_chr_write;
     chr->chr_add_read_handler = win_chr_add_read_handler;
+    qemu_chr_reset(chr);
     return chr;
 }
     
@@ -2537,6 +2564,7 @@
     s->connected = 1;
     qemu_set_fd_handler2(s->fd, tcp_chr_read_poll,
                          tcp_chr_read, NULL, chr);
+    qemu_chr_reset(chr);
 }
 
 #define IACSET(x,a,b,c) x[0] = a; x[1] = b; x[2] = c;