From nobody Tue Sep 9 18:56:53 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 1749821634899408.17281389146933; Fri, 13 Jun 2025 06:33:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B9243DDF; Fri, 13 Jun 2025 09:33:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B6CB7DB6; Fri, 13 Jun 2025 09:33:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DBC1DD65; Fri, 13 Jun 2025 09:33:24 -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 3F5B7D65 for ; Fri, 13 Jun 2025 09:33:24 -0400 (EDT) Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55D5Wo06008154 for ; Fri, 13 Jun 2025 13:33:23 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474x4mpbpu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Jun 2025 13:33:23 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55D9TOcZ015180 for ; Fri, 13 Jun 2025 13:33:22 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 474yrttej4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Jun 2025 13:33:22 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55DDXLgR33423888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 13 Jun 2025 13:33:22 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E66358068 for ; Fri, 13 Jun 2025 13:33:21 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 64F0C58056 for ; Fri, 13 Jun 2025 13:33:21 +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 for ; Fri, 13 Jun 2025 13:33:21 +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= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=BzTIUHojwc3jLxqYM cqc914olhtFAz/OcSbZ7HuHqeE=; b=DRu/12QejaumHHBUM2qgBk7T5BqoJZw2S WeTakuLAKUVF54C36ZXmtYr/XVV6QIPNN6kVbpLeNMXHakMxVmJzcocNuBDLhJvm ge0z/drYg7WPdi9BHP2gCGUU8R2Bbz+NmfFllvFMrZw0dAYsrd6vaT00olGBbXvO JT99Lk30OaMSFTdQsTGpSEXB/nn2aDojckFaRr0dq2/LfAUSqYpqJWv/WbsSmHs6 nyCW3ysdCX32NuiWxlNAp1CzzNBpBXLSyDDaEhi+zTtB2ujAnMPIfULQkPXgx+uT 5PMm5IlmGkN8D0EOuCX6CONMC8SZn28C3ewZ3GYNTNFcyYaQOWcBw== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v4 1/5] docs: domain: document deprecated_features attribute Date: Fri, 13 Jun 2025 09:33:11 -0400 Message-ID: <20250613133315.41095-2-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=Y4X4sgeN c=1 sm=1 tr=0 ts=684c28a3 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=6NW3q09aOV3XLQ4Zp1YA:9 X-Proofpoint-GUID: JzzZHPbEUVNMjfVng1AkXiulaWzfC9mc X-Proofpoint-ORIG-GUID: JzzZHPbEUVNMjfVng1AkXiulaWzfC9mc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDA5NyBTYWx0ZWRfXzXebPe5Nj/Jg 8QbMRyegtD8YW4AZ/nyoZMRl7qxEYu64LBdFgWZBwUMhXkv7Ijo1Ju8m16Nk3PDaMSTtp0Sc2yh TxKEwnaSoatNjSHOG6DSjGtX5sIYsjHmJ5RoaPtSvdY8qz7sYuR7T4Jju2SPhvveLSf21lJVBTF CDeHOoAKEjSjEz0g82mXT9Fy3HiXOcD/uLH5pX2VvgLFsFKnwLa3YilL791Ui1WSj66frqLL5ik 6C1c2//e0jd+GSV2iCfvjE1ckA0jrHceEq2p+QMUU3+B6fjAnHpZzWNto4vIOmYj+SBvk6mcCIZ LcOhjzK2B/oH75QKw/4nI/dizWJpHjSOzTTzVriDCC50HM1d1duKcfnE+cydWjuMxpB6HBWWv7z S/Qw8uFhygLXGXgTEkpQFa6qUB+GJMAlH2jbWUKMkHqM6oFIxCnbx6N1wX7bA24myRjxh8WO 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 mlxlogscore=999 spamscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 phishscore=0 mlxscore=0 priorityscore=1501 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: VE5THGVDSQUMWOA43ZC3WA3QCCHCU4IF X-Message-ID-Hash: VE5THGVDSQUMWOA43ZC3WA3QCCHCU4IF 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: 1749821636777116600 Content-Type: text/plain; charset="utf-8" Provide documentation for the deprecated_features XML attribute. Available since 11.0.0, and supported for S390. Signed-off-by: Collin Walling --- docs/formatdomain.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c7c75ae219..fbe8da765f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1674,6 +1674,14 @@ In case no restrictions need to be put on CPU model = and its features, a simpler ... =20 +``deprecated_features`` + :since:`Since 11.0.0`, S390 guests may utilize the ``deprecated_feature= s`` + attribute to specify toggling of CPU model features that are flagged as + deprecated by the hypervisor. When this attribute is set to ``off``, the + active guest XML will reflect the respective features with the disable + policy. When this attribute is set to ``on``, the respective features w= ill + be enabled. + ``cache`` :since:`Since 3.3.0` the ``cache`` element describes the virtual CPU ca= che. If the element is missing, the hypervisor will use a sensible default. --=20 2.47.1 From nobody Tue Sep 9 18:56:53 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 1749821798930488.0906700329632; Fri, 13 Jun 2025 06:36:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D99CB11C1; Fri, 13 Jun 2025 09:36:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E4989137F; Fri, 13 Jun 2025 09:33:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C2F1BDCF; Fri, 13 Jun 2025 09:33:27 -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 5315BD77 for ; Fri, 13 Jun 2025 09:33:26 -0400 (EDT) Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55D6TadJ001885 for ; Fri, 13 Jun 2025 13:33:25 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 4769x064cs-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 (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 55D9SbEm021905 for ; Fri, 13 Jun 2025 13:33:23 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 475050aam3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Jun 2025 13:33:23 +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 55DDXM2g16384766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Jun 2025 13:33:22 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F373358056; Fri, 13 Jun 2025 13:33:21 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B85D858060; Fri, 13 Jun 2025 13:33:21 +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:21 +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=htTfEp3Fw8/A+M9iL W2L2uQeAHGw4WxDqVRd9mTgPdU=; b=RqZDn4NTN7XqTYmnn8vEoqfeOjwCT2q9m aC5I6QV+3ifZKT1eCJfXuQSFj4UMO9Kux7EbiV2F6DGN0mObrHYu1Ayc7FbfQFHT 2JHIyXL6wJxBJxC9xW8iVTkCYeaZbgKVi8aZ8YmXqupD2N4TxwKvkG8l5VdB4nhc HEmzEc+Tw7GybFZTytlzLVJZwCwORrrikc6BJjQ45scxTRJKAMtfMvk0ZThxetIt 72CL8hleFb113lr147g3AU9CXg8QikijILOqwO06r5sLJFCcH1R+SYUgCM/Yr1pK zwwAQxTcWpvSx6rGem2J7uyxvOI0VMq1MbX74c0rOKsOEnnezfC4g== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v4 2/5] qemu: caps: add virCPUFeaturePolicy param to virQEMUCapsUpdateCPUDeprecatedFeatures Date: Fri, 13 Jun 2025 09:33:12 -0400 Message-ID: <20250613133315.41095-3-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-Proofpoint-ORIG-GUID: YPysme7-NccsXutd0UojmE5jRR6Ey9Yr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDA5NyBTYWx0ZWRfXzKvCmJinRqDu 93PG2K4gbdPRGeaRBVyESLbNRry3ADyrlDjQUMKTIInou/tEiAvoqlAIjoHByPDGKehKAnnQW1u kt40V2Q3QhPGt0D8nHsG0av81XfwIiEYE0T0ulF4g+cQvY3axigWBWv6YJGJ9tEzYsrqWF/2+9j yhNY7UAgnBVtF8HYPAZTdIGYIK1R0nus3Tr5/dyS7hQwXXrxu3Dt/WWDOh0ENO+VZtFUhQRFGLe ySOtj2ZcIgDv55JSgcCDZLza45+7dZMzuecomO5Zhp4CtGef7gUuF+Ub835+mEHg3ExADJuKznt 4u9gUanoGFb9ZE1VvXGOXfLZLrBaJUnOq+l9326BZZcHOZCa/8M2pcn7EvYzDhVa+XxvGODBJl9 5x2LB7eEmwi5Pounh3gc/esFC26vZTkRbJfL2fYieH5JY2HyLlhg8dyBtAgR0wotmjT0vzTU X-Authority-Analysis: v=2.4 cv=YKGfyQGx c=1 sm=1 tr=0 ts=684c28a5 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=QFYkeVJvKV2vq4rAkosA:9 X-Proofpoint-GUID: YPysme7-NccsXutd0UojmE5jRR6Ey9Yr 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 clxscore=1015 malwarescore=0 bulkscore=0 priorityscore=1501 phishscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 adultscore=0 mlxlogscore=999 suspectscore=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: JTUTSWRHABULIDD5UAOARIZUSZA6TKGC X-Message-ID-Hash: JTUTSWRHABULIDD5UAOARIZUSZA6TKGC 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: 1749821800646116600 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. Add a test with guest XML using deprecated_features=3D'on' to ensure the API is working properly. Signed-off-by: Collin Walling Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_capabilities.c | 6 ++-- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_process.c | 9 ++++-- ...l-deprecated-features-on.s390x-latest.args | 32 +++++++++++++++++++ ...el-deprecated-features-on.s390x-latest.xml | 25 +++++++++++++++ .../cpu-model-deprecated-features-on.xml | 15 +++++++++ tests/qemuxmlconftest.c | 1 + 8 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-on.= s390x-latest.args create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-on.= s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/cpu-model-deprecated-features-on.= xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b600dd38b8..275f2f1e0b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3347,7 +3347,8 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, void virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps, virDomainVirtType virtType, - virCPUDef *cpu) + virCPUDef *cpu, + virCPUFeaturePolicy policy) { qemuMonitorCPUModelInfo *modelInfo; size_t i; @@ -3358,8 +3359,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 df33212a34..50d3f7226c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -779,7 +779,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 aef313ae9c..9ac8bcdffe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16716,7 +16716,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 04e5c005a0..c05aa05a5a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6595,8 +6595,13 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, return -1; } =20 - if (def->cpu->deprecated_feats =3D=3D VIR_TRISTATE_SWITCH_OFF) { - virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, de= f->cpu); + 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; + + virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, + def->cpu, policy); } =20 return 0; diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-l= atest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-l= atest.args new file mode 100644 index 0000000000..8cdb2a2ac2 --- /dev/null +++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.a= rgs @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/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 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 22782664-6b93-46bf-9595-317220dd2d1c \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-l= atest.xml b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-la= test.xml new file mode 100644 index 0000000000..3bea664f40 --- /dev/null +++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.x= ml @@ -0,0 +1,25 @@ + + guest + 22782664-6b93-46bf-9595-317220dd2d1c + 219100 + 219100 + 1 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-s390x + +