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 3F22DC4321E for ; Wed, 13 Apr 2022 15:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236481AbiDMP3c (ORCPT ); Wed, 13 Apr 2022 11:29:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236471AbiDMP32 (ORCPT ); Wed, 13 Apr 2022 11:29:28 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A44C762CA9; Wed, 13 Apr 2022 08:27:06 -0700 (PDT) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DEie7V009518; Wed, 13 Apr 2022 15:27:06 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=GVQWUJg5PcLWQHAvgnUSiQlon8GzP2GbnsGXNnRomyw=; b=O74B32xkflDfmfx+eVKNK2b9Ijve293bZht4r+3hOKh8xZQEL/iimrcvKQ4Fi8WrZuGv iwkfyDtOd4LVdcen7zwgMXRqDhKpGX1N7GJtY5hx+c93lp1io2zCfef3vkkayQySuSc8 zr584bxlwq9QeHohU2MmR8ZV1y3NweWsNPuKw0IYOTdIOYwrfZ9vZHNTEC3pXtIceF3Q cmdUw9CVKX18L+RzLjtC8TLBgaEt+yIsfH8DdEcTuA7wNHLB4k/Qx6PzHijGRM2zSpg2 hcI1H2iOy+VpufDpk6rnP3oxK7gDPcAqgeqh1mTzF5Un+UQwgdYc3G8c+G2WRMHaK8bw gg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fe0j4h2je-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Apr 2022 15:27:06 +0000 Received: from m0098394.ppops.net (m0098394.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 23DEjL4K010722; Wed, 13 Apr 2022 15:27:05 GMT Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fe0j4h2hd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Apr 2022 15:27:05 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 23DFHXNE022580; Wed, 13 Apr 2022 15:27:03 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06fra.de.ibm.com with ESMTP id 3fbsj04kee-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Apr 2022 15:27:03 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 23DFQxCW19857860 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 15:26:59 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AB7194C040; Wed, 13 Apr 2022 15:26:59 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 74D2E4C046; Wed, 13 Apr 2022 15:26:59 +0000 (GMT) Received: from t46lp57.lnxne.boe (unknown [9.152.108.100]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 13 Apr 2022 15:26:59 +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 v2 3/4] s390x: don't run migration tests under PV Date: Wed, 13 Apr 2022 17:26:57 +0200 Message-Id: <20220413152658.715003-4-nrb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220413152658.715003-1-nrb@linux.ibm.com> References: <20220413152658.715003-1-nrb@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: JanZs-yFqXT2choqEKwkCqMujxBF9FgS X-Proofpoint-ORIG-GUID: Eg6MkPZ_6GyfC5de2Rufv63qjJiRfnyp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-13_02,2022-04-13_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 mlxscore=0 clxscore=1015 phishscore=0 impostorscore=0 malwarescore=0 bulkscore=0 adultscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130080 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 Reviewed-by: Claudio Imbrenda Acked-by: Thomas Huth --- 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