It could be nice to migrate more than once in a test case. This patch
supports multiple migrations by flipping dest file/socket variables to
source after the migration is complete, ready to start again. Test
cases may now switch to calling migrate() one or more times as needed.
Only problem here is that the migration command now polls for the
"EXIT: STATUS" output line to see if the test is finished or wants
another migration, and x86 doesn't seem to output that line. It does
print something, but only if !no_test_device, so this will break x86.
I'm not sure why the exit status isn't printed in that case. Any ideas?
Thanks,
Nick
---
lib/migrate.c | 8 +++---
lib/migrate.h | 1 +
scripts/arch-run.bash | 59 +++++++++++++++++++++++++++++++++++--------
3 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/lib/migrate.c b/lib/migrate.c
index 527e63ae..b7721659 100644
--- a/lib/migrate.c
+++ b/lib/migrate.c
@@ -8,8 +8,10 @@
#include <libcflat.h>
#include "migrate.h"
-/* static for now since we only support migrating exactly once per test. */
-static void migrate(void)
+/*
+ * Initiate migration and wait for it to complete.
+ */
+void migrate(void)
{
puts("Now migrate the VM, then press a key to continue...\n");
(void)getchar();
@@ -19,8 +21,6 @@ static void migrate(void)
/*
* Initiate migration and wait for it to complete.
* If this function is called more than once, it is a no-op.
- * Since migrate_cmd can only migrate exactly once this function can
- * simplify the control flow, especially when skipping tests.
*/
void migrate_once(void)
{
diff --git a/lib/migrate.h b/lib/migrate.h
index 3c94e6af..2af06a72 100644
--- a/lib/migrate.h
+++ b/lib/migrate.h
@@ -6,4 +6,5 @@
* Author: Nico Boehr <nrb@xxxxxxxxxxxxx>
*/
+void migrate(void);
void migrate_once(void);
diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index 5e7e4201..6a0a54f5 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -131,28 +131,58 @@ run_migration ()
migsock=$(mktemp -u -t mig-helper-socket.XXXXXXXXXX)
migout1=$(mktemp -t mig-helper-stdout1.XXXXXXXXXX)
+ migout2=$(mktemp -t mig-helper-stdout2.XXXXXXXXXX)
qmp1=$(mktemp -u -t mig-helper-qmp1.XXXXXXXXXX)
qmp2=$(mktemp -u -t mig-helper-qmp2.XXXXXXXXXX)
fifo=$(mktemp -u -t mig-helper-fifo.XXXXXXXXXX)
qmpout1=/dev/null
qmpout2=/dev/null
+ migcmdline=$@
trap 'kill 0; exit 2' INT TERM
- trap 'rm -f ${migout1} ${migsock} ${qmp1} ${qmp2} ${fifo}' RETURN EXIT
+ trap 'rm -f ${migout1} ${migout2} ${migsock} ${qmp1} ${qmp2} ${fifo}' RETURN EXIT
- eval "$@" -chardev socket,id=mon1,path=${qmp1},server=on,wait=off \
+ eval "$migcmdline" -chardev socket,id=mon1,path=${qmp1},server=on,wait=off \
-mon chardev=mon1,mode=control | tee ${migout1} &
+ live_pid=`jobs -l %+ | grep Running | awk '{print$2}'`
+ # This starts the first source QEMU in advance of the test reaching the
+ # migration point, since we expect at least one migration. Subsequent
+ # sources are started as the test hits migrate keywords.
+ do_migration || return $?
+
+ while ! grep -q -i "EXIT" < ${migout1} ; do
+ # Wait for EXIT or further migrations
+ if ! grep -q -i "Now migrate the VM" < ${migout1} ; then
+ sleep 1
+ else
+ do_migration || return $?
+ fi
+ done
+
+ wait $live_pid
+ ret=$?
+
+ while (( $(jobs -r | wc -l) > 0 )); do
+ sleep 0.5
+ done
+
+ return $ret
+}
+
+do_migration ()
+{
# We have to use cat to open the named FIFO, because named FIFO's, unlike
# pipes, will block on open() until the other end is also opened, and that
# totally breaks QEMU...
mkfifo ${fifo}
- eval "$@" -chardev socket,id=mon2,path=${qmp2},server=on,wait=off \
- -mon chardev=mon2,mode=control -incoming unix:${migsock} < <(cat ${fifo}) &
- incoming_pid=`jobs -l %+ | awk '{print$2}'`
+
+ eval "$migcmdline" -chardev socket,id=mon2,path=${qmp2},server=on,wait=off \
+ -mon chardev=mon2,mode=control -incoming unix:${migsock} < <(cat ${fifo}) | tee ${migout2} &
+ incoming_pid=`jobs -l %+ | grep Running | awk '{print$2}'`
# The test must prompt the user to migrate, so wait for the "migrate" keyword
- while ! grep -q -i "migrate" < ${migout1} ; do
+ while ! grep -q -i "Now migrate the VM" < ${migout1} ; do
sleep 1
done
@@ -172,12 +202,19 @@ run_migration ()
done
qmp ${qmp1} '"quit"'> ${qmpout1} 2>/dev/null
echo > ${fifo}
- wait $incoming_pid
- ret=$?
+ rm ${fifo}
- while (( $(jobs -r | wc -l) > 0 )); do
- sleep 0.5
- done
+ wait $live_pid
+ ret=$?
+ live_pid=${incoming_pid}
+
+ # Now flip the variables because dest becomes source
+ tmp=${migout1}
+ migout1=${migout2}
+ migout2=${tmp}
+ tmp=${qmp1}
+ qmp1=${qmp2}
+ qmp2=${tmp}
return $ret
}
--
2.40.1
