ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-char: remove use of QEMUTimer in favor of glib idle function 

qemu-char is now independent of the QEMU main loop.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Message-id: 3cda0bbcfb94912df8a767983a52bb71a4a3231d.1362505276.git.amit.shah@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-03-05 23:21:27 +05:30
parent 8aa33cafc4
commit 9f939df955
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/char/char.h
View File

@ -71,7 +71,7 @@ struct CharDriverState {
void (*chr_guest_open)(struct CharDriverState *chr); void (*chr_guest_open)(struct CharDriverState *chr);
void (*chr_guest_close)(struct CharDriverState *chr); void (*chr_guest_close)(struct CharDriverState *chr);
void *opaque; void *opaque;
QEMUTimer *open_timer; int idle_tag;
char *label; char *label;
char *filename; char *filename;
int opened; int opened;

12
qemu-char.c
View File

@ -122,20 +122,18 @@ void qemu_chr_be_event(CharDriverState *s, int event)
s->chr_event(s->handler_opaque, event); s->chr_event(s->handler_opaque, event);
} }
static void qemu_chr_fire_open_event(void *opaque) static gboolean qemu_chr_generic_open_bh(gpointer opaque)
{ {
CharDriverState *s = opaque; CharDriverState *s = opaque;
qemu_chr_be_event(s, CHR_EVENT_OPENED); qemu_chr_be_event(s, CHR_EVENT_OPENED);
qemu_free_timer(s->open_timer); s->idle_tag = 0;
s->open_timer = NULL; return FALSE;
} }
void qemu_chr_generic_open(CharDriverState *s) void qemu_chr_generic_open(CharDriverState *s)
{ {
if (s->open_timer == NULL) { if (s->idle_tag == 0) {
s->open_timer = qemu_new_timer_ms(rt_clock, s->idle_tag = g_idle_add(qemu_chr_generic_open_bh, s);
qemu_chr_fire_open_event, s);
qemu_mod_timer(s->open_timer, qemu_get_clock_ms(rt_clock) - 1);
} }
} }