From nobody Tue Sep 9 23:35:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747892143816622.1809040665462; Wed, 21 May 2025 22:35:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CAE361558; Thu, 22 May 2025 01:35:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 242BC17E9; Thu, 22 May 2025 01:33:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5B536C62; Thu, 22 May 2025 01:33:41 -0400 (EDT) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3607B164 for ; Thu, 22 May 2025 01:33:40 -0400 (EDT) Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54LI2jJx014651 for ; Thu, 22 May 2025 05:33:39 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46sbph59jc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 May 2025 05:33:39 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54M5KI2P032122 for ; Thu, 22 May 2025 05:33:38 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 46rwnmfxhh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 May 2025 05:33:38 +0000 Received: from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com [10.241.53.104]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54M5Xbxp32965296 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 May 2025 05:33:37 GMT Received: from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B9EC25805D for ; Thu, 22 May 2025 05:33:37 +0000 (GMT) Received: from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 87ABB58052 for ; Thu, 22 May 2025 05:33:37 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.ibm.com.com (unknown [9.67.133.17]) by smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP for ; Thu, 22 May 2025 05:33:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=IvB416SK6jCEHLJJw gWd6jiLWNdsjWu9CtdIJJKFgOU=; b=YKp0YOvl8057Oz4tGhbPSfGh/2IemFanX p+vBKtCb5HxSgPTY5qIKP7ByvpjsZ1lZevFJRtfG39dM1HuHjsttbV7qXkb9ZmG4 qW57frqJhU+oWxbMd2pPGBoMzs94rAkk+6KmIW4LutWEGt6IRFMSWOoHCZIYQ1Cr 850nBQ/lBXCIulpZ4v7JgG//pBp6SYNgEt5GcqczJ0L4QwA6Mp6fnef/v7q5rln4 cXa1B0yPhQuyokzNmvxRfV5Lnq9ISLfrl2LGg8fE1S4pWiZGfYa7+UONiKSDpMA3 7nhYQ8eZ7ya/qPK7Xm++FA+ehP2oPXMtwabimR0Dizwjg7aS9JVeg== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v2 3/3] qemu: process: disable deprecated features for s390 host-model by default Date: Thu, 22 May 2025 01:33:25 -0400 Message-ID: <20250522053325.214083-4-walling@linux.ibm.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250522053325.214083-1-walling@linux.ibm.com> References: <20250522053325.214083-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDA0OCBTYWx0ZWRfX98BA/0Xw1RjE 53sCm1z3iEHv1xuLEwJeVbO0ZXTwE171w9yfcga/MKe1jIBk/ynTlV0RY8dyOl7FP1Ni6rW7fCV +K4TqdaFdIUWY/BlKtyoh7ZrfLzCM1yZomQ8hfbtwGA5mbkr51FReQ80931ZwzUdzHej5cBOLjK +UUT369GsyWbGWYu8w8EfgyvDYxWuD85RjXlbwjiS60+DKsV2d6fVblDmLTMPMXQn1bKA3E0p+W OxLtlqUgs1gzKDYokvshEje3TFRfyk2n+8MKvamHL2NNxq+JQTc+ttGno68OPkHNXxNLtEA3z16 ydcgJfAapbuxsoYfE401Erp6jnTBOOYpoIyQcUElQSDYADBLBWYHRlAggOSnRdiJHTSoWQ21BrZ bgS1TFf7wpDeKZ4elG5mbTaki+kRExKmDlU1Ivt4UV++naWvroKLMZbusiGYtXE8Eylh0M55 X-Proofpoint-ORIG-GUID: GZQFFq29Yeb5jR-zwvuL2xRAy55GJt8S X-Authority-Analysis: v=2.4 cv=L5kdQ/T8 c=1 sm=1 tr=0 ts=682eb733 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=xQk_qFyJGeju4DOV7U0A:9 X-Proofpoint-GUID: GZQFFq29Yeb5jR-zwvuL2xRAy55GJt8S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_02,2025-05-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 clxscore=1015 mlxlogscore=957 suspectscore=0 phishscore=0 impostorscore=0 malwarescore=0 mlxscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220048 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7PJAEB56Y3QUNQLLZTC4D44OP2EOWIXW X-Message-ID-Hash: 7PJAEB56Y3QUNQLLZTC4D44OP2EOWIXW X-MailFrom: walling@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747892144776116600 Content-Type: text/plain; charset="utf-8" To ease the user with defining a guest with a migratable CPU model, let's disable the deprecated features from the get-go if using mode host-model. If these features are still desired, they may be reenabled via the deprecated_features=3D'on' attribute. Some existing tests utilize this updated behavior, so update the CPU features on the corresponding args files. Signed-off-by: Collin Walling --- src/qemu/qemu_process.c | 9 +++++++++ .../default-video-type-s390x.s390x-latest.args | 2 +- .../hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- ...s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- tests/qemuxmlconfdata/s390-panic.s390x-latest.args | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b4989f7ab8..53ba90f03b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6547,6 +6547,15 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, return -1; } =20 + /* s390 CPU models should disable deprecated features off by default. + * Set the flag now so the appropriate features are updated later. + */ + if (ARCH_IS_S390(def->os.arch) && + def->cpu->mode =3D=3D VIR_CPU_MODE_HOST_MODEL && + !def->cpu->deprecated_feats) { + def->cpu->deprecated_feats =3D VIR_TRISTATE_SWITCH_OFF; + } + /* nothing to update for host-passthrough / maximum */ if (def->cpu->mode !=3D VIR_CPU_MODE_HOST_PASSTHROUGH && def->cpu->mode !=3D VIR_CPU_MODE_MAXIMUM) { diff --git a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.ar= gs b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args index 1c1a1066e4..ff71f5b872 100644 --- a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-s/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-default-video-type-s/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Doff,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,ms= a5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Do= n,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don= ,mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh= 2=3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Do= n,apqci=3Don,cte=3Doff,ais=3Don,bpb=3Doff,ctop=3Don,gs=3Don,ppa15=3Don,zpci= =3Don,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Doff,cmm=3Don,vxpdeh2=3Don \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":107374182= 4}' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-l= atest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-l= atest.args index d69ebfc8fd..25c0ed2c9c 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.a= rgs +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.a= rgs @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-KVMGues= t1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-KVMGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Doff,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,ms= a5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Do= n,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don= ,mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh= 2=3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Do= n,apqci=3Don,cte=3Doff,ais=3Don,bpb=3Doff,ctop=3Don,gs=3Don,ppa15=3Don,zpci= =3Don,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Doff,cmm=3Don,vxpdeh2=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.arg= s b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args index 4f052238e9..4c80d0bf39 100644 --- a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,confidential-guest-support=3Dlsec0 \ -accel kvm \ --cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Doff,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,ms= a5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Do= n,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don= ,mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh= 2=3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Do= n,apqci=3Don,cte=3Doff,ais=3Don,bpb=3Doff,ctop=3Don,gs=3Don,ppa15=3Don,zpci= =3Don,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Doff,cmm=3Don,vxpdeh2=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390= x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s= 390x-latest.args index a6d8ba5952..3f3de9a668 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-lates= t.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Doff,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,ms= a5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Do= n,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don= ,mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh= 2=3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Do= n,apqci=3Don,cte=3Doff,ais=3Don,bpb=3Doff,ctop=3Don,gs=3Don,ppa15=3Don,zpci= =3Don,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Doff,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/= tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args index e56d48ac36..3efa883d8c 100644 --- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Doff,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,ms= a5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Do= n,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don= ,mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh= 2=3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Do= n,apqci=3Don,cte=3Doff,ais=3Don,bpb=3Doff,ctop=3Don,gs=3Don,ppa15=3Don,zpci= =3Don,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Doff,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args b/tests/qem= uxmlconfdata/s390-panic.s390x-latest.args index c5e4c9245e..8afd5de0f6 100644 --- a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Doff,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,ms= a5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Do= n,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don= ,mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh= 2=3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Do= n,apqci=3Don,cte=3Doff,ais=3Don,bpb=3Doff,ctop=3Don,gs=3Don,ppa15=3Don,zpci= =3Don,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Doff,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ --=20 2.47.1