From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xim0Q-0005Qx-9e for qemu-devel@nongnu.org; Mon, 27 Oct 2014 11:14:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xim0L-0001qH-GL for qemu-devel@nongnu.org; Mon, 27 Oct 2014 11:14:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xim0K-0001q4-W7 for qemu-devel@nongnu.org; Mon, 27 Oct 2014 11:14:45 -0400 From: Paolo Bonzini Date: Mon, 27 Oct 2014 16:13:39 +0100 Message-Id: <1414422825-6166-23-git-send-email-pbonzini@redhat.com> In-Reply-To: <1414422825-6166-1-git-send-email-pbonzini@redhat.com> References: <1414422825-6166-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 22/28] qtest: fix qtest log fd should be initialized before qtest chardev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Li Liu 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- qtest.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qtest.c b/qtest.c index 946b560..2bca04e 100644 --- a/qtest.c +++ b/qtest.c @@ -545,11 +545,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+"); @@ -558,6 +553,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.8.3.1