From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP7FG-0005uG-16 for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:52:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP7F8-0007ET-Tw for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:52:53 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:25021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP7F8-00078G-8K for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:52:46 -0400 From: "john.liuli" Date: Wed, 3 Sep 2014 17:52:06 +0800 Message-ID: <1409737926-3468-1-git-send-email-john.liuli@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] qtest: fix qtest log fd should be initialized before qtest chardev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: Li Liu , qemu-devel@nongnu.org From: Li Liu qtest_log_fp should be inited before qemu_chr_add_handlers. If not the log dumped from callback functions may be lost. easy to reproduce it by command: "QTEST_LOG=1 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 gtester -k --verbose -m=quick tests/qdev-monitor-test" The log "[I xxxxxx] OPENED" should be printed out by qtest_event, but does not. Signed-off-by: Li Liu --- qtest.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qtest.c b/qtest.c index ef0d991..2a33d98 100644 --- a/qtest.c +++ b/qtest.c @@ -537,11 +537,6 @@ void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) return; } - qemu_chr_add_handlers(chr, qtest_can_read, qtest_read, qtest_event, chr); - qemu_chr_fe_set_echo(chr, true); - - inbuf = g_string_new(""); - if (qtest_log) { if (strcmp(qtest_log, "none") != 0) { qtest_log_fp = fopen(qtest_log, "w+"); @@ -550,6 +545,10 @@ void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) qtest_log_fp = stderr; } + qemu_chr_add_handlers(chr, qtest_can_read, qtest_read, qtest_event, chr); + qemu_chr_fe_set_echo(chr, true); + + inbuf = g_string_new(""); qtest_chr = chr; } -- 1.7.9.5