From 321ded29e663ca040a0c4ecd3ff97452c9d30a3f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 7 Nov 2025 17:43:06 +0000 Subject: [PATCH] system/qtest.c: Allow for multiple CHR_EVENT_CLOSED events MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In the qtest_event() QEMUChrEvent handler, we create a timer and log OPENED on CHR_EVENT_OPENED, and we destroy the timer and log CLOSED on CHR_EVENT_CLOSED. However, the chardev subsystem can send us more than one CHR_EVENT_CLOSED if we're reading from a file chardev: * the first one happens when we read the last data from the file * the second one happens when the user hits ^C to exit QEMU and the chardev is finalized: char_fd_finalize() This causes us to call g_timer_elapsed() with a NULL timer (which glib complains about) and print an extra CLOSED log line with a zero timestamp: [I +0.063829] CLOSED qemu-system-aarch64: GLib: g_timer_elapsed: assertion 'timer != NULL' failed [I +0.000000] CLOSED Avoid this by ignoring a CHR_EVENT_CLOSED if we have already processed one. Signed-off-by: Peter Maydell Reviewed-by: Laurent Vivier Reviewed-by: Fabiano Rosas Message-ID: <20251107174306.1408139-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- system/qtest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/qtest.c b/system/qtest.c index e4d1cd75da..cbeb7f3772 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -808,6 +808,10 @@ static void qtest_event(void *opaque, QEMUChrEvent event) } break; case CHR_EVENT_CLOSED: + if (!qtest_opened) { + /* Ignore CLOSED events if we have already closed the log */ + break; + } qtest_opened = false; if (qtest_log_fp) { fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n", g_timer_elapsed(timer, NULL)); -- 2.47.3