From fad276489cbc04f228d52b7019bee9e7a88c8a86 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Fri, 2 Dec 2011 15:42:55 +0530 Subject: [PATCH 118/118] char: Disable write callback if throttled chardev is detached If a throttled chardev is detached from the frontend device, all future callbacks should be suppressed. Not doing this results in a segfault. Bugzilla: 745758 Upstream: Not applicable, since throttling is a RHEL6-only feature. Signed-off-by: Amit Shah --- qemu-char.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 5f67652..5a94919 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -220,6 +220,11 @@ void qemu_chr_add_handlers(CharDriverState *s, ++s->avail_connections; } if (!handlers) { + if (s->write_blocked) { + /* Ensure we disable the callback if we were throttled */ + s->chr_disable_write_fd_handler(s); + /* s->write_blocked is cleared below */ + } handlers = &null_handlers; } s->chr_can_read = handlers->fd_can_read; -- 1.7.7.5