From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHsb3-00039Q-Bq for qemu-devel@nongnu.org; Mon, 24 Feb 2014 05:17:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHsb2-0007yD-IT for qemu-devel@nongnu.org; Mon, 24 Feb 2014 05:17:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHsb2-0007y2-Ag for qemu-devel@nongnu.org; Mon, 24 Feb 2014 05:17:12 -0500 From: Gal Hammer Date: Mon, 24 Feb 2014 12:16:42 +0200 Message-Id: <1393237002-16980-3-git-send-email-ghammer@redhat.com> In-Reply-To: <1393237002-16980-1-git-send-email-ghammer@redhat.com> References: <1393237002-16980-1-git-send-email-ghammer@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] qtest: fix a "!chr->fd_in_tag" assertion error in qtest. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, peter.maydell@linaro.org, Gal Hammer , anthony@codemonkey.ws Replacement of the default chardev handlers now requires a call to release the current handlers. Signed-off-by: Gal Hammer --- monitor.c | 1 + qtest.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/monitor.c b/monitor.c index de90fba..db52e7f 100644 --- a/monitor.c +++ b/monitor.c @@ -5024,6 +5024,7 @@ void monitor_init(CharDriverState *chr, int flags) if (monitor_ctrl_mode(mon)) { mon->mc = g_malloc0(sizeof(MonitorControl)); /* Control mode requires special handlers */ + qemu_chr_add_handlers(chr, NULL, NULL, NULL, NULL); qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read, monitor_control_event, mon); qemu_chr_fe_set_echo(chr, true); diff --git a/qtest.c b/qtest.c index ae941d6..a5682ee 100644 --- a/qtest.c +++ b/qtest.c @@ -519,6 +519,8 @@ void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) return; } + /* Replace the default tcp's handlers with qtest's handlers. */ + qemu_chr_add_handlers(chr, NULL, NULL, NULL, NULL); qemu_chr_add_handlers(chr, qtest_can_read, qtest_read, qtest_event, chr); qemu_chr_fe_set_echo(chr, true); -- 1.8.5.3