Merge remote branch 'amit/for-anthony' into staging

This commit is contained in:
Anthony Liguori 2011-03-24 08:11:58 -05:00
commit 56d7a964a5
8 changed files with 52 additions and 27 deletions

View file

@ -197,6 +197,10 @@ void qemu_chr_add_handlers(CharDriverState *s,
IOEventHandler *fd_event,
void *opaque)
{
if (!opaque) {
/* chr driver being released. */
s->assigned = 0;
}
s->chr_can_read = fd_can_read;
s->chr_read = fd_read;
s->chr_event = fd_event;