Commit 25afd6eb authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/chardev.7' into staging 

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/chardev.7:
  chardev: fix pty_chr_timer

Message-id: 1378972894-11185-1-git-send-email-kraxel@redhat.com
parents 7f87af39 b0d768c3

qemu-char.c

+4 −8
Original line number Diff line number Diff line
@@ -1026,15 +1026,11 @@ static gboolean pty_chr_timer(gpointer opaque) 
    struct CharDriverState *chr = opaque;

    PtyCharDriver *s = chr->opaque;



    if (s->connected) {

        goto out;

    }



    s->timer_tag = 0;

    if (!s->connected) {

        /* Next poll ... */

        pty_chr_update_read_handler(chr);



out:

    s->timer_tag = 0;

    }

    return FALSE;

}