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 1749821726468168.5423042567454; Fri, 13 Jun 2025 06:35:26 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9271FD66; Fri, 13 Jun 2025 09:35:25 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8448512F2; Fri, 13 Jun 2025 09:33:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9DC93DA0; Fri, 13 Jun 2025 09:33:26 -0400 (EDT) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 7F149D32 for ; Fri, 13 Jun 2025 09:33:25 -0400 (EDT) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55DDPA53015375 for ; Fri, 13 Jun 2025 13:33:25 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474hgv0dh4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Jun 2025 13:33:24 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55DAAH5W014908 for ; Fri, 13 Jun 2025 13:33:24 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4750rpj88d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Jun 2025 13:33:24 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55DDXMYU24248892 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Jun 2025 13:33:23 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B4DFE5806F; Fri, 13 Jun 2025 13:33:22 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6E5B65806E; Fri, 13 Jun 2025 13:33:22 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.ibm.com.com (unknown [9.67.26.12]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 13 Jun 2025 13:33:22 +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.4 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4,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=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=aLlj+CZMB0Nz4pIAi NWBz5lYAXDkEaKBI3gxoxIgYQ0=; b=hxbtMi0n7F3KECE+vUjzEjjB0knTGS55d htn0OI+5NWA56XNHds1x54lq/5OuV7gcSQSOKjEooDrtlZKFSj/FmIDUYaAf+MnM BZQ1iZq+dMs+mhlAw39CVrhBAzgUgj9LXuoiPOV5dYPQ7jyeseV+Q4yJ0ed4384h BPL+/X1l1YzeG9dIPA38ebwSjmPWT1l0pLKZyN3mb3HCquuEU2cSKnHMLz+FxAKW gyWcmQLbq4zYzOTgfEyJlew0nZCY0GwT+Y+ZDJQiLOq+jyQ6PKYTztNfl/ZejH9o 8ovhM4+IlZQF7ZNFa7/Ty0ZQVxu5DVyXEKFDcb5bLS0w/TJTyCZvQ== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v4 4/5] qemu: add default_cpu_deprecated_features configuration option Date: Fri, 13 Jun 2025 09:33:14 -0400 Message-ID: <20250613133315.41095-5-walling@linux.ibm.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250613133315.41095-1-walling@linux.ibm.com> References: <20250613133315.41095-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=Pfr/hjhd c=1 sm=1 tr=0 ts=684c28a4 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=af-VB006VqjmlZph74MA:9 X-Proofpoint-GUID: i_dcwJKjVAAiFnGJOJPDG1STrjbt5Kwh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDA5NyBTYWx0ZWRfX3Eex53KYc17L 3x9JkEjwNwwTza0p8Viuqg2zkhQKoL2YXla8d38lF3hwzepyA648ji+ws/aw3Q1fxsQPGiOdf08 lnt7TCBh3m3nw2gmJnppyGW2NosDKptVqXY6OFsxUhRqaJ9Md72ZU/Aa3SM4+UpSFjoyO9N3kgP 9wJimJg2DYqyLnEEIHtqSGHW0Jy/hTXBp3ryBCCYQ3tKwD8PGu8jB1bi2TSe6yAd5VJUgls80U3 TbZBU90GroB79qnE7whsKDik2JrQ92fNlFrKQUqfbWB0M1C5suFC7vV5QCbJjDSye+S4in3GJ6m My2Mw1Yo7OwwZeQnfoZBaRGhHl8gTHO5g0fuxNqggVIcYe4d3/mrWouAJih3WKgX95g0GLguGo5 5MMWAA7JlKHigSaWqOhsC+8yYtX31qDWtDIV1Zs9rL6vTWG9A2aDsmMOK7cU8acsoc+7/+Jo X-Proofpoint-ORIG-GUID: i_dcwJKjVAAiFnGJOJPDG1STrjbt5Kwh 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-06-13_01,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 adultscore=0 clxscore=1015 phishscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506130097 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MJLSQEREXGJDG43YSVYQ6HPJ4NLZGA4V X-Message-ID-Hash: MJLSQEREXGJDG43YSVYQ6HPJ4NLZGA4V 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 CC: Boris Fiuczynski 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: 1749821727748116600 Content-Type: text/plain; charset="utf-8" Allow to define the default for deprecated_features when the attribute is not set in the cpu defintion of a domain XML. 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: Boris Fiuczynski Signed-off-by: Collin Walling --- src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf.in | 14 ++++++++ src/qemu/qemu_conf.c | 33 +++++++++++++++++++ src/qemu/qemu_conf.h | 12 +++++++ src/qemu/qemu_process.c | 26 ++++++++++++++- src/qemu/test_libvirtd_qemu.aug.in | 1 + ...default-video-type-s390x.s390x-latest.args | 2 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- .../s390-panic.s390x-latest.args | 2 +- 12 files changed, 94 insertions(+), 7 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index bd744940d2..5727cf605f 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -158,6 +158,8 @@ module Libvirtd_qemu =3D =20 let filesystem_entry =3D str_array_entry "shared_filesystems" =20 + let default_cpu_deprecated_features =3D str_entry "default_cpu_deprecat= ed_features" + (* Entries that used to exist in the config which are now * deleted. We keep on parsing them so we don't break * ability to parse old configs after upgrade @@ -190,6 +192,7 @@ module Libvirtd_qemu =3D | capability_filters_entry | storage_entry | filesystem_entry + | default_cpu_deprecated_features | obsolete_entry =20 let comment =3D [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \= t\n][^\n]*)?/ . del /\n/ "\n" ] diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 502adbf5c3..3224967aca 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -1126,3 +1126,17 @@ # "/path/to/nvram", # "/path/to/swtpm" #] + +# If QEMU provides a list of deprecated CPU features it is possible to use +# this list for removal of deprecated CPU features during CPU model expans= ion. +# The deprecated_features XML attribute on the XML CPU element in the doma= in +# XML can be used to turn deprecated CPU features 'off' or 'on'. Using the +# option default_cpu_deprecated_features allows to define the default beha= vior +# when the attribute deprecated_features is not provided in the domain XML. +# +# Possible options are: +# "off" - (default) deprecated features are removed during CPU model expa= nsion +# "on" - deprecated features remain required in the expanded CPU model +# "none" - no deprecated_features attribute is added to expanded CPU model +# +#default_cpu_deprecated_features =3D "off" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 8ffbcacaf2..a6b43c2209 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -81,6 +81,11 @@ VIR_ENUM_IMPL(virQEMUSchedCore, "emulator", "full"); =20 +VIR_ENUM_IMPL(virQEMUDeprecatedFeatures, + QEMU_DEPRECATED_FEATURES_LAST, + "off", + "on", + "none"); =20 static virClass *virQEMUDriverConfigClass; static void virQEMUDriverConfigDispose(void *obj); @@ -1265,6 +1270,31 @@ virQEMUDriverConfigLoadFilesystemEntry(virQEMUDriver= Config *cfg, } =20 =20 +static int +virQEMUDriverConfigLoadDeprecatedFeaturesEntry(virQEMUDriverConfig *cfg, + virConf *conf) +{ + g_autofree char *depFeats =3D NULL; + + if (virConfGetValueString(conf, "default_cpu_deprecated_features", &de= pFeats) < 0) + return -1; + if (depFeats) { + int val =3D virQEMUDeprecatedFeaturesTypeFromString(depFeats); + + if (val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown default_cpu_deprecated_features valu= e %1$s"), + depFeats); + return -1; + } + + cfg->defaultDeprecatedFeatures =3D val; + } + + return 0; +} + + int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg, const char *filename, bool privileged) @@ -1345,6 +1375,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *= cfg, if (virQEMUDriverConfigLoadFilesystemEntry(cfg, conf) < 0) return -1; =20 + if (virQEMUDriverConfigLoadDeprecatedFeaturesEntry(cfg, conf) < 0) + return -1; + return 0; } =20 diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index f6b13c828d..8d0aa66aca 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -58,6 +58,16 @@ typedef enum { =20 VIR_ENUM_DECL(virQEMUSchedCore); =20 +typedef enum { + QEMU_DEPRECATED_FEATURES_OFF =3D 0, + QEMU_DEPRECATED_FEATURES_ON, + QEMU_DEPRECATED_FEATURES_NONE, + + QEMU_DEPRECATED_FEATURES_LAST +} virQEMUDeprecatedFeatures; + +VIR_ENUM_DECL(virQEMUDeprecatedFeatures); + typedef struct _virQEMUDriver virQEMUDriver; =20 typedef struct _virQEMUDriverConfig virQEMUDriverConfig; @@ -254,6 +264,8 @@ struct _virQEMUDriverConfig { virQEMUSchedCore schedCore; =20 char **sharedFilesystems; + + virQEMUDeprecatedFeatures defaultDeprecatedFeatures; }; =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8e3b5cda88..6c2dbd1514 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6502,6 +6502,7 @@ static int qemuProcessUpdateGuestCPU(virDomainDef *def, virQEMUCaps *qemuCaps, virArch hostarch, + virQEMUDriverConfig *cfg, unsigned int flags) { if (!def->cpu) @@ -6547,6 +6548,29 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, return -1; } =20 + /* s390 CPU models should disable deprecated features for host-models = by + * default if supported by QEMU. Set the flag now so the appropriate + * features are updated later. + */ + if (ARCH_IS_S390(def->os.arch) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRE= CATED_PROPS) && + def->cpu->mode =3D=3D VIR_CPU_MODE_HOST_MODEL && + !def->cpu->deprecated_feats) { + switch (cfg->defaultDeprecatedFeatures) { + case QEMU_DEPRECATED_FEATURES_OFF: + def->cpu->deprecated_feats =3D VIR_TRISTATE_SWITCH_OFF; + break; + case QEMU_DEPRECATED_FEATURES_ON: + def->cpu->deprecated_feats =3D VIR_TRISTATE_SWITCH_ON; + break; + case QEMU_DEPRECATED_FEATURES_NONE: + def->cpu->deprecated_feats =3D VIR_TRISTATE_SWITCH_ABSENT; + break; + case QEMU_DEPRECATED_FEATURES_LAST: + break; + } + } + /* 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) { @@ -7001,7 +7025,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver, priv->pausedReason =3D VIR_DOMAIN_PAUSED_UNKNOWN; =20 VIR_DEBUG("Updating guest CPU definition"); - if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, driver->hostarc= h, flags) < 0) + if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, driver->hostarc= h, cfg, flags) < 0) return -1; =20 for (i =3D 0; i < vm->def->nshmems; i++) diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qe= mu.aug.in index 88d1a6aca1..08c825aa40 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -136,3 +136,4 @@ module Test_libvirtd_qemu =3D { "2" =3D "/path/to/nvram" } { "3" =3D "/path/to/swtpm" } } +{ "default_cpu_deprecated_features" =3D "off" } 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