qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Fabiano Rosas" <farosas@suse.de>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PULL 06/17] tests/qtest: tighten up the checks on clock_step
Date: Mon, 10 Feb 2025 16:14:40 +0000	[thread overview]
Message-ID: <20250210161451.3273284-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250210161451.3273284-1-alex.bennee@linaro.org>

It is invalid to call clock_step with an implied time to step forward
as if no timers are running we won't be able to advance.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250207153112.3939799-7-alex.bennee@linaro.org>

diff --git a/system/qtest.c b/system/qtest.c
index 28b6fac37c..12152efbcd 100644
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -708,10 +708,19 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
         } else {
             ns = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL,
                                             QEMU_TIMER_ATTR_ALL);
+            if (ns < 0) {
+                qtest_send(chr, "FAIL "
+                           "cannot advance clock to the next deadline "
+                           "because there is no pending deadline\n");
+                return;
+            }
         }
         new_ns = qemu_clock_advance_virtual_time(old_ns + ns);
-        qtest_sendf(chr, "%s %"PRIi64"\n",
-                    new_ns > old_ns ? "OK" : "FAIL", new_ns);
+        if (new_ns > old_ns) {
+            qtest_sendf(chr, "OK %"PRIi64"\n", new_ns);
+        } else {
+            qtest_sendf(chr, "FAIL could not advance time\n");
+        }
     } else if (strcmp(words[0], "module_load") == 0) {
         Error *local_err = NULL;
         int rv;
-- 
2.39.5



  parent reply	other threads:[~2025-02-10 16:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-10 16:14 [PULL 00/17] testing and gdbstub updates Alex Bennée
2025-02-10 16:14 ` [PULL 01/17] tests/docker: replicate the check-rust-tools-nightly CI job Alex Bennée
2025-02-10 16:14 ` [PULL 02/17] tests/qtest: don't attempt to clock_step while waiting for virtio ISR Alex Bennée
2025-02-10 16:14 ` [PULL 03/17] tests/qtest: don't step clock at start of npcm7xx periodic IRQ test Alex Bennée
2025-02-10 16:14 ` [PULL 04/17] tests/qtest: simplify qtest_process_inbuf Alex Bennée
2025-02-10 16:14 ` [PULL 05/17] tests/qtest: rename qtest_send_prefix and roll-up into qtest_send Alex Bennée
2025-02-10 16:14 ` Alex Bennée [this message]
2025-02-10 16:14 ` [PULL 07/17] Revert "util/timer: avoid deadlock when shutting down" Alex Bennée
2025-02-10 16:14 ` [PULL 08/17] tests/qtest/migration: Add --full option Alex Bennée
2025-02-10 16:14 ` [PULL 09/17] tests/qtest/migration: Pick smoke tests Alex Bennée
2025-02-10 16:14 ` [PULL 10/17] gdbstub: Allow the %d placeholder in the socket path Alex Bennée
2025-02-10 16:14 ` [PULL 11/17] gdbstub: Try unlinking the unix socket before binding Alex Bennée
2025-02-17  9:03   ` Zhao Liu
2025-02-10 16:14 ` [PULL 12/17] user: Introduce user/signal.h Alex Bennée
2025-02-10 16:14 ` [PULL 13/17] user: Introduce host_interrupt_signal Alex Bennée
2025-02-10 16:14 ` [PULL 14/17] osdep: Introduce qemu_kill_thread() Alex Bennée
2025-02-10 16:14 ` [PULL 15/17] gdbstub: Allow late attachment Alex Bennée
2025-02-10 16:14 ` [PULL 16/17] docs/user: Document the %d placeholder and suspend=n QEMU_GDB features Alex Bennée
2025-02-10 16:14 ` [PULL 17/17] tests/tcg: Add late gdbstub attach test Alex Bennée
2025-02-11  2:37 ` [PULL 00/17] testing and gdbstub updates Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250210161451.3273284-7-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=farosas@suse.de \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).