From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FCB1C433FE for ; Mon, 11 Apr 2022 10:08:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345134AbiDKKKR (ORCPT ); Mon, 11 Apr 2022 06:10:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345121AbiDKKKL (ORCPT ); Mon, 11 Apr 2022 06:10:11 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0E6842A1D; Mon, 11 Apr 2022 03:07:57 -0700 (PDT) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23B7Mfu9025031; Mon, 11 Apr 2022 10:07:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=iSkrpprj+l+ZrwbHVoA12mFue309mDYDxeYNbTtZoKc=; b=hLhuOiM3tNUKpIcy4Sn9I7j41zJy1FDt7IbLDiPQwBGD5gL2ryNwFa37sCiWa3esH//9 c8cJXdP5/yczwFCMSDY6Lb43KOyotglVueTEOD/acqFnZoASrHr/+1UzUKO6bcH0DDm+ PjLWR5hB+87no7qi02XG9sGVo9TeQttVjETKRX17WEl5sBZxlzvHm1Y1ijpSlJLDTyfQ MFG7Es3107/RNBtShMADe7fNWp/S/Sq3ohAND3LwOdyUVko08OAsp+vFuGAx6gV+8I7Y 7I18zyGjYTxlxI89LkuvNV6OqgkxR+0sLPXHBqK+re5RxGCWJA9fPsO4hvavOSsqj1ra Pw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fcfvwu377-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Apr 2022 10:07:56 +0000 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 23B9pfsw013464; Mon, 11 Apr 2022 10:07:56 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fcfvwu368-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Apr 2022 10:07:56 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 23BA7sRc010281; Mon, 11 Apr 2022 10:07:54 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04fra.de.ibm.com with ESMTP id 3fb1s8t9a4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Apr 2022 10:07:54 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 23BA80Vp46727668 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 Apr 2022 10:08:00 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7A101A4054; Mon, 11 Apr 2022 10:07:51 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 38B57A4060; Mon, 11 Apr 2022 10:07:51 +0000 (GMT) Received: from t46lp57.lnxne.boe (unknown [9.152.108.100]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 11 Apr 2022 10:07:51 +0000 (GMT) From: Nico Boehr To: kvm@vger.kernel.org, linux-s390@vger.kernel.org Cc: frankja@linux.ibm.com, imbrenda@linux.ibm.com, thuth@redhat.com Subject: [kvm-unit-tests PATCH v1 3/4] s390x: don't run migration tests under PV Date: Mon, 11 Apr 2022 12:07:49 +0200 Message-Id: <20220411100750.2868587-4-nrb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220411100750.2868587-1-nrb@linux.ibm.com> References: <20220411100750.2868587-1-nrb@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: hZHPdLWUAjE-KzqzxOLZBL-XuPCIaP6H X-Proofpoint-GUID: lHKLwwi85T3uia0A6bihSIzZl18_tzdH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-04-11_03,2022-04-11_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 impostorscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=965 bulkscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204110057 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org PV doesn't support migration, so don't run the migration tests there. Signed-off-by: Nico Boehr --- 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 -- 2.31.1