From 107684c05d80c457aa6e81d090b36a1a294110ec Mon Sep 17 00:00:00 2001 From: Li Liu Date: Wed, 22 Oct 2014 10:26:47 +0800 Subject: [PATCH] qtest: fix qtest log fd should be initialized before qtest chardev 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 946b560d6a..2bca04ed4c 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; }