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)
56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
From fe75f8834809b41779366a852190715b33b2af5d Mon Sep 17 00:00:00 2001
|
|
From: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 18 Dec 2023 11:56:32 +0000
|
|
Subject: [PATCH] iotests: fix 194: filter out racy postcopy-active event
|
|
|
|
The event is racy: it will not appear in the output if bitmap is
|
|
migrated during downtime period of migration and postcopy phase is not
|
|
started.
|
|
|
|
cheery-pick from dcc28ab603f30df5cc8be1f759b423e94ae7d10f
|
|
|
|
Fixes: ae00aa239847 "iotests: 194: test also migration of dirty bitmap"
|
|
Reported-by: Richard Henderson <richard.henderson@linaro.org>
|
|
|
|
Signed-off-by: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
Message-Id: <20230607143606.1557395-1-vsementsov@yandex-team.ru>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
|
---
|
|
tests/qemu-iotests/194 | 5 +++++
|
|
tests/qemu-iotests/194.out | 1 -
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194
|
|
index e44b8df728..4c8a952cd8 100755
|
|
--- a/tests/qemu-iotests/194
|
|
+++ b/tests/qemu-iotests/194
|
|
@@ -74,6 +74,11 @@ with iotests.FilePath('source.img') as source_img_path, \
|
|
|
|
while True:
|
|
event1 = source_vm.event_wait('MIGRATION')
|
|
+ if event1['data']['status'] == 'postcopy-active':
|
|
+ # This event is racy, it depends do we really do postcopy or bitmap
|
|
+ # was migrated during downtime (and no data to migrate in postcopy
|
|
+ # phase). So, don't log it.
|
|
+ continue
|
|
iotests.log(event1, filters=[iotests.filter_qmp_event])
|
|
if event1['data']['status'] in ('completed', 'failed'):
|
|
iotests.log('Gracefully ending the `drive-mirror` job on source...')
|
|
diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out
|
|
index 4e6df1565a..376ed1d2e6 100644
|
|
--- a/tests/qemu-iotests/194.out
|
|
+++ b/tests/qemu-iotests/194.out
|
|
@@ -14,7 +14,6 @@ Starting migration...
|
|
{"return": {}}
|
|
{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
-{"data": {"status": "postcopy-active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
Gracefully ending the `drive-mirror` job on source...
|
|
{"return": {}}
|
|
--
|
|
2.27.0
|
|
|