diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-17 09:49:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-17 09:49:44 -0500 |
| commit | 25afd6eb150324c70164875853a9aede08c48aff (patch) | |
| tree | 0f4b0269cd5bd39ce3801125f10ccb42efc2ccc4 | |
| parent | 7f87af39dc786a979e7ebba338d0781e366060ed (diff) | |
| parent | b0d768c35e08d2057b63e8e77e7a513c447199fa (diff) | |
| download | focaccia-qemu-25afd6eb150324c70164875853a9aede08c48aff.tar.gz focaccia-qemu-25afd6eb150324c70164875853a9aede08c48aff.zip | |
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
| -rw-r--r-- | qemu-char.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/qemu-char.c b/qemu-char.c index 62594965bd..f7f5464b67 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1026,15 +1026,11 @@ static gboolean pty_chr_timer(gpointer opaque) struct CharDriverState *chr = opaque; PtyCharDriver *s = chr->opaque; - if (s->connected) { - goto out; - } - - /* Next poll ... */ - pty_chr_update_read_handler(chr); - -out: s->timer_tag = 0; + if (!s->connected) { + /* Next poll ... */ + pty_chr_update_read_handler(chr); + } return FALSE; } |