On Mon, 11 Apr 2022 12:07:49 +0200
Nico Boehr <nrb@xxxxxxxxxxxxx> wrote:
> PV doesn't support migration, so don't run the migration tests there.
>
> Signed-off-by: Nico Boehr <nrb@xxxxxxxxxxxxx>
Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
> ---
> s390x/run | 5 +++++
> scripts/s390x/func.bash | 2 +-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/s390x/run b/s390x/run
> index 2bcdabbaa14f..24138f6803be 100755
> --- a/s390x/run
> +++ b/s390x/run
> @@ -20,6 +20,11 @@ if [ "${1: -7}" = ".pv.bin" ] || [ "${TESTNAME: -3}" = "_PV" ] && [ "$ACCEL" = "
> exit 2
> fi
>
> +if [ "${1: -7}" = ".pv.bin" ] || [ "${TESTNAME: -3}" = "_PV" ] && [ "$MIGRATION" = "yes" ]; then
> + echo "Migration isn't supported under Protected Virtualization"
> + exit 2
> +fi
> +
> M='-machine s390-ccw-virtio'
> M+=",accel=$ACCEL"
> command="$qemu -nodefaults -nographic $M"
> diff --git a/scripts/s390x/func.bash b/scripts/s390x/func.bash
> index bf799a567c3b..2a941bbb0794 100644
> --- a/scripts/s390x/func.bash
> +++ b/scripts/s390x/func.bash
> @@ -21,7 +21,7 @@ function arch_cmd_s390x()
> "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
>
> # run PV test case
> - if [ "$ACCEL" = 'tcg' ]; then
> + if [ "$ACCEL" = 'tcg' ] || find_word "migration" "$groups"; then
> return
> fi
> kernel=${kernel%.elf}.pv.bin
