9ad2faa8b2
- ui/vnc.c: Fixed a deadlock bug. - hw/i386: Fix comment style in topology.h - migration/multifd: Remove unnecessary usage of local Error - linux-user: fix sockaddr_in6 endianness - vhost_vdpa: fix the input in trace_vhost_vdpa_listener_region_del() - iotests: fix 194: filter out racy postcopy-active event - tests/avocado: fix waiting for vm shutdown in replay_linux - ui/vnc: fix debug output for invalid audio message Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 2b6068aae3fe18cd0c948c22b4531b344c3e2b6c)
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 0242c2c743987efc6955fc4405b540140b1b678d Mon Sep 17 00:00:00 2001
|
|
From: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 18 Dec 2023 11:57:38 +0000
|
|
Subject: [PATCH] tests/avocado: fix waiting for vm shutdown in replay_linux
|
|
|
|
This patch fixes the race condition in waiting for shutdown
|
|
of the replay linux test.
|
|
|
|
cheery-pick from b821109583a035a17fa5b89c0ebd8917d09cc82d
|
|
|
|
Signed-off-by: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
|
|
Suggested-by: John Snow <jsnow@redhat.com>
|
|
Message-ID: <20230811070608.3383343-4-pavel.dovgalyuk@ispras.ru>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
---
|
|
tests/avocado/replay_linux.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py
|
|
index 15953f9e49..897d5bad19 100644
|
|
--- a/tests/avocado/replay_linux.py
|
|
+++ b/tests/avocado/replay_linux.py
|
|
@@ -82,7 +82,7 @@ def launch_and_wait(self, record, args, shift):
|
|
% os.path.getsize(replay_path))
|
|
else:
|
|
vm.event_wait('SHUTDOWN', self.timeout)
|
|
- vm.shutdown(True)
|
|
+ vm.wait()
|
|
logger.info('successfully fihished the replay')
|
|
elapsed = time.time() - start_time
|
|
logger.info('elapsed time %.2f sec' % elapsed)
|
|
--
|
|
2.27.0
|
|
|