mirror of
https://github.com/xemu-project/xemu.git
synced 2025-02-17 18:48:36 +00:00
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
This commit is contained in:
commit
25afd6eb15
12
qemu-char.c
12
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;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user