summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorVladimir Lukianov <1844144@gmail.com>2025-06-03 14:54:59 +0200
committerAlex Bennée <alex.bennee@linaro.org>2025-10-07 09:15:45 +0100
commit41f8f2be27736192bab29aa38380c9ebaae810fa (patch)
tree3b1c1b63583f039f6f17011821b3186d7e7c8aab
parent4d3eb329ccf34da76b0b7822eecaaacc6e6fe646 (diff)
downloadfocaccia-qemu-41f8f2be27736192bab29aa38380c9ebaae810fa.tar.gz
focaccia-qemu-41f8f2be27736192bab29aa38380c9ebaae810fa.zip
record/replay: fix race condition on test_aarch64_reverse_debug
Ensures EVENT_INSTRUCTION written to replay.bin before EVENT_SHUTDOWN_HOST_QMP

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2921
Signed-off-by: Vladimir Lukianov <1844144@gmail.com>
Message-ID: <20250603125459.17688-1-1844144@gmail.com>
[AJB: fix re-base file mode]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
-rw-r--r--replay/replay.c2
-rwxr-xr-xtests/functional/aarch64/test_reverse_debug.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/replay/replay.c b/replay/replay.c
index a3e24c967a..b2121788c1 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -263,6 +263,8 @@ bool replay_has_interrupt(void)
 
 void replay_shutdown_request(ShutdownCause cause)
 {
+    replay_save_instructions();
+
     if (replay_mode == REPLAY_MODE_RECORD) {
         g_assert(replay_mutex_locked());
         replay_put_event(EVENT_SHUTDOWN + cause);
diff --git a/tests/functional/aarch64/test_reverse_debug.py b/tests/functional/aarch64/test_reverse_debug.py
index 906f10aec5..ec3348c96d 100755
--- a/tests/functional/aarch64/test_reverse_debug.py
+++ b/tests/functional/aarch64/test_reverse_debug.py
@@ -25,7 +25,6 @@ class ReverseDebugging_AArch64(ReverseDebugging):
          'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'),
         '7e1430b81c26bdd0da025eeb8fbd77b5dc961da4364af26e771bd39f379cbbf7')
 
-    @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/2921")
     def test_aarch64_virt(self):
         self.set_machine('virt')
         self.cpu = 'cortex-a53'