Sometimes, QEMU needs a bit longer to remove the incoming migration
socket. This happens in some environments on s390x for the
migration-skey-sequential test.
Instead of directly erroring out, wait for the removal of the socket.
Signed-off-by: Nico Boehr <nrb@xxxxxxxxxxxxx>
---
scripts/arch-run.bash | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index 2214d940cf7d..413f3eda8cb8 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -237,12 +237,8 @@ do_migration ()
echo > ${dst_infifo}
rm ${dst_infifo}
- # Ensure the incoming socket is removed, ready for next destination
- if [ -S ${dst_incoming} ] ; then
- echo "ERROR: Incoming migration socket not removed after migration." >& 2
- qmp ${dst_qmp} '"quit"'> ${dst_qmpout} 2>/dev/null
- return 2
- fi
+ # Wait for the incoming socket being removed, ready for next destination
+ while [ -S ${dst_incoming} ] ; do sleep 0.1 ; done
wait ${live_pid}
ret=$?
--
2.44.0
