From nobody Tue Sep 9 03:10:43 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 1746130756614284.7646119340644; Thu, 1 May 2025 13:19:16 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id ADF9513CF; Thu, 1 May 2025 16:19:15 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DE07F14AA; Thu, 1 May 2025 16:17:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5FC231389; Thu, 1 May 2025 16:17:31 -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 48F3413A1 for ; Thu, 1 May 2025 16:17:30 -0400 (EDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 541BppG2019522 for ; Thu, 1 May 2025 20:17:29 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 46bwu1chws-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 May 2025 20:17:28 +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 541H11av000666 for ; Thu, 1 May 2025 20:17:28 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 469atpps23-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 May 2025 20:17:28 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 541KHRhV29622858 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 1 May 2025 20:17:27 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2FCAA5804E for ; Thu, 1 May 2025 20:17:27 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA3E558066 for ; Thu, 1 May 2025 20:17:26 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.ibm.com.com (unknown [9.67.18.203]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP for ; Thu, 1 May 2025 20:17:26 +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=tYBCtvofx6p6aZcjx Bu719kghambkNrXYFu7CQUduCs=; b=n+LZ06mMmpHW+DjG/afBXsihyx1jxnMTY SsM3QLm4065i8pInZxbTk9IcXo17tIWSjzEzWydu8iIP7groORmqS3A0PmbXRzSB 1uqcPX8pzOiEyJmovUF9FS2az+UnF3emuuv7I1tnZa0nC7dorzk/yqDxBXEpwO1f L9bybl751qKe1iXlvPdv3NBBrM33Z+UWdVgElbaW8PGhgdCvqyq9Z55Z2DQ02TQT mhZtqlBmC3K+nAlJHtM93lUwN9zCAG5HEYZaofRtGH8NeD9CRQOU4NeksiT9IKYL +OGJlmTW02gKNnSnIts7717y02sVyrAIf9xAiHH6nQrclhY8+KTjQ== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v1 1/2] qemu: caps: add virCPUFeaturePolicy param to virQEMUCapsUpdateCPUDeprecatedFeatures Date: Thu, 1 May 2025 16:17:12 -0400 Message-ID: <20250501201713.44172-2-walling@linux.ibm.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501201713.44172-1-walling@linux.ibm.com> References: <20250501201713.44172-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: CDpDCJYVT4wvQMcdG5FR9h3kroeEiGYi X-Authority-Analysis: v=2.4 cv=e7QGSbp/ c=1 sm=1 tr=0 ts=6813d6d8 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=tucZJfYFxNPaZtbU29AA:9 X-Proofpoint-ORIG-GUID: CDpDCJYVT4wvQMcdG5FR9h3kroeEiGYi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAxMDE1MyBTYWx0ZWRfXwJJaQX1Dr6/0 CLX1Ickfku4xbukMwvBL14UIJsN8f4vx+NNcHzEpg3tdBP0HTQO/vhDaQJ9mF4sh+E4WHjoA8+L CCEczyG9iPvLZZj88pdZ7yFVwcTcsQH9GpC/6tcXgPjlkHHAI0W65RhYmW+2PCN/8D/oc27hymA almCA4BR8TKnZ69YtwSP48ts+fr1nmlKB4n7dN3JWwjQdoYJf0zEO/WHm6hLmACzb8k0uuRgV16 zCskjnS4z6Bcjw8yfFjv3lI54S4kj/n5iT6VzDOQ3pIjFBhbP5Sui7pcUA0NCweltEPru1rQwgJ jL9g5XU9nLUWrMm2MlofGDTBaj+8Xi/5D6LOuX47XkBFoD3mH7cVJbmcKbyWhEfCJ947heEXdpH dpoQZqYI8LKNXVoRFiY4OrnaAn0kZVtVJx3X44Pi+rY+9sWGQa2CKRpDF4CjKx5wDJHvcIIn 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-01_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 adultscore=0 spamscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 mlxlogscore=971 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505010153 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QCFPPMGOPYXDSVTKKHMOMKXECXZ6UAAW X-Message-ID-Hash: QCFPPMGOPYXDSVTKKHMOMKXECXZ6UAAW 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: 1746130758488019100 Content-Type: text/plain; charset="utf-8" Currently, virQEMUCapsUpdateCPUDeprecatedFeatures only allows for disabling deprecated features. This locks the deprecated_features attribute to only do something if set to 'off'. Let's add a virCPUFeaturePolicy to the function's parameters which will allow the caller to decide what happens to these features. Additionally, group the relevant code in qemu_process.c. Signed-off-by: Collin Walling --- src/qemu/qemu_capabilities.c | 6 +++--- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_process.c | 19 ++++++++++++------- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a804335c85..5f94863818 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3341,7 +3341,8 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, void virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps, virDomainVirtType virtType, - virCPUDef *cpu) + virCPUDef *cpu, + virCPUFeaturePolicy policy) { qemuMonitorCPUModelInfo *modelInfo; size_t i; @@ -3352,8 +3353,7 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *q= emuCaps, return; =20 for (i =3D 0; i < g_strv_length(modelInfo->deprecated_props); i++) { - virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i], - VIR_CPU_FEATURE_DISABLE); + virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i], policy= ); } } =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ea7c14daa9..e4d8b0b6b6 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -778,7 +778,8 @@ int virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, char ***features); void virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps, virDomainVirtType virtType, - virCPUDef *cpu); + virCPUDef *cpu, + virCPUFeaturePolicy policy); =20 virDomainVirtType virQEMUCapsGetVirtType(virQEMUCaps *qemuCaps); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a34d6f1437..677b4b72a8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16722,7 +16722,8 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, =20 if (flags & VIR_CONNECT_GET_DOMAIN_CAPABILITIES_DISABLE_DEPRECATED_FEA= TURES) { virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, virttype, - domCaps->cpu.hostModel); + domCaps->cpu.hostModel, + VIR_CPU_FEATURE_DISABLE); } =20 return virDomainCapsFormat(domCaps); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1af91c5909..5820499710 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6588,15 +6588,20 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, &def->os.arch) < 0) return -1; =20 - if (def->cpu->deprecated_feats && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPR= ECATED_PROPS)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + if (def->cpu->deprecated_feats) { + virCPUFeaturePolicy policy =3D VIR_CPU_FEATURE_REQUIRE; + + if (def->cpu->deprecated_feats =3D=3D VIR_TRISTATE_SWITCH_OFF) + policy =3D VIR_CPU_FEATURE_DISABLE; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_= DEPRECATED_PROPS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("toggling deprecated features for CPU model is un= supported")); - return -1; - } + return -1; + } =20 - if (def->cpu->deprecated_feats =3D=3D VIR_TRISTATE_SWITCH_OFF) { - virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, de= f->cpu); + virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, + def->cpu, policy); } =20 return 0; --=20 2.47.1 From nobody Tue Sep 9 03:10:43 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 1746130726542945.8007303799831; Thu, 1 May 2025 13:18:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 983341421; Thu, 1 May 2025 16:18:45 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5337413DE; Thu, 1 May 2025 16:17:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2678113A0; Thu, 1 May 2025 16:17:31 -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 107C713A4 for ; Thu, 1 May 2025 16:17:30 -0400 (EDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 541BpV8L019135 for ; Thu, 1 May 2025 20:17:29 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46bwu1chwt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 May 2025 20:17:29 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 541JvqAT016584 for ; Thu, 1 May 2025 20:17:28 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 469a70pwk8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 May 2025 20:17:28 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 541KHR0H20644542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 1 May 2025 20:17:28 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E4BB58055 for ; Thu, 1 May 2025 20:17:27 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 54B8758056 for ; Thu, 1 May 2025 20:17:27 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.ibm.com.com (unknown [9.67.18.203]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP for ; Thu, 1 May 2025 20:17:27 +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=UqC23oMuMjWc6BmmV dgVD1HqhcJ8OIX9lN14qbGR84A=; b=Ukgk4t/sbDfYgZqFYdPwmOYPEBkprmdiY tlULQ+QKjrx98j/+4n0V12Gxc39h3eVc+tHfKKQwRsUi+qt3fHpGVtz2mSsta8mP rKSS5YtcAUzcobFYihNM7HsUMI0j6miLOffVNc65VSE1dhmJmEnJHPdi6EjLbjx3 rFgtiSKVG7pETxrBOxvuLkLb48+YcdqTqsTp9H9kOfLFfBYftrnjPY1pBTtNyYRo 4bBj7v0iyS0gDEG57IRnTnbxNinbO1jPBgnwGZqymqxI/vpzXgmVhWlK39PGf25I K4kQPsNUNssYCgkxWaScXdvCfBhxTne6y/GptVOrY90v4R2Hzoywg== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v1 2/2] qemu: caps: disable deprecated features for s390 models by default Date: Thu, 1 May 2025 16:17:13 -0400 Message-ID: <20250501201713.44172-3-walling@linux.ibm.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501201713.44172-1-walling@linux.ibm.com> References: <20250501201713.44172-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: fJef6MXMcAlTwom8XNwR1_7ru1qW5YeZ X-Authority-Analysis: v=2.4 cv=e7QGSbp/ c=1 sm=1 tr=0 ts=6813d6d9 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=k_3f7HCM24RMepyRWEAA:9 X-Proofpoint-ORIG-GUID: fJef6MXMcAlTwom8XNwR1_7ru1qW5YeZ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAxMDE1MyBTYWx0ZWRfX8wfml6o6XBtg B/Kr7RWRMKhvV3XrETcplR1T2WapOqu+ivbejlV2MW/bVmaAecJm0x8Kriu0Vyj2mbNaFD/KIW2 B2lPxJSD0IOBfdVf95UGt0nrthcI0gZPjypHIMQjIhzRIUS0Ms5C15QmrSI5XGtTX0+3Vul4zh1 JvmtX2csfy6roDfXim5khFXKkPnTdYTpsLNGX+PIw3Hp34PgcuaGGm9ZLX5B7dShVUBOmnIAsqh 0nDbDPSKgH8tPGXjV7nfV+avR1BFg/gIZ7RdmbKVUwBUBqx3eSNznsEosoYomrSBWGxSF4Mka26 f3YNer6/rRxruihQgyTvmlKULOqI0z59C58Vg7v6ixg663ueaW6G0/PrE2PmfQBHs91tmEDnEYf cl2wHRsx3FrwCMwf/zUWDhOx3z+XWYuRR1lhvQDcHh9mqKze/Bo1MLW4j+kt93nnRNoAeuAJ 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-01_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 adultscore=0 spamscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 mlxlogscore=808 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505010153 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: X2XGUWSSWP26CCQLDBLBTOBL5JZEPOJ6 X-Message-ID-Hash: X2XGUWSSWP26CCQLDBLBTOBL5JZEPOJ6 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: 1746130728935019100 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 these features are still desired, they may be reenabled via the deprecated_features=3D'on' attribute. Signed-off-by: Collin Walling --- src/qemu/qemu_capabilities.c | 4 ++++ tests/domaincapsdata/qemu_10.0.0.s390x.xml | 8 ++++---- tests/domaincapsdata/qemu_9.1.0.s390x.xml | 8 ++++---- tests/domaincapsdata/qemu_9.2.0.s390x.xml | 8 ++++---- .../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 +- .../qemuxmlconfdata/s390-defaultconsole.s390x-latest.args | 2 +- tests/qemuxmlconfdata/s390-panic.s390x-latest.args | 2 +- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5f94863818..6d2ab41901 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3813,6 +3813,10 @@ virQEMUCapsInitCPUModelS390(virQEMUCaps *qemuCaps, cpu->nfeatures++; } =20 + /* Disable deprecated features by default */ + virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, type, cpu, + VIR_CPU_FEATURE_DISABLE); + return 0; } =20 diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsd= ata/qemu_10.0.0.s390x.xml index d66240307e..5fb38b5ed5 100644 --- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml @@ -43,7 +43,7 @@ - + @@ -79,9 +79,9 @@ - + - + @@ -89,7 +89,7 @@ - + diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsda= ta/qemu_9.1.0.s390x.xml index b73e0d0688..77a35bc20d 100644 --- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -43,7 +43,7 @@ - + @@ -79,9 +79,9 @@ - + - + @@ -89,7 +89,7 @@ - + diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_9.2.0.s390x.xml index 605a3af5c7..94c0311de7 100644 --- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml @@ -43,7 +43,7 @@ - + @@ -79,9 +79,9 @@ - + - + @@ -89,7 +89,7 @@ - + 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