qxl: Call spice_qxl_driver_unload from qxl_enter_vga_mode

[qemu.git] / qemu-char.c

diff --git a/qemu-char.c b/qemu-char.c
index f29f9b1997b8a27ad85aedff12b32a0789ffe70a..64e824d0acb1a0f773060b45c9b5f7eea0f43b93 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1077,6 +1077,7 @@ static gboolean pty_chr_timer(gpointer opaque)
     pty_chr_update_read_handler(chr);
 
 out:
+    s->timer_tag = 0;
     return FALSE;
 }
 
@@ -2642,6 +2643,7 @@ static gboolean tcp_chr_accept(GIOChannel *channel, GIOCondition cond, void *opa
        }
         fd = qemu_accept(s->listen_fd, addr, &len);
         if (fd < 0 && errno != EINTR) {
+            s->listen_tag = 0;
             return FALSE;
         } else if (fd >= 0) {
             if (s->do_telnetopt)