From nobody Tue Sep 9 23:31:27 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 1747893851785262.0162855311728; Wed, 21 May 2025 23:04:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C56D61786; Thu, 22 May 2025 02:04:10 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C37C61812; Thu, 22 May 2025 02:03:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1EE58153F; Thu, 22 May 2025 02:03:23 -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 964C01539 for ; Thu, 22 May 2025 02:03:22 -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 54M5Q4ZE014686 for ; Thu, 22 May 2025 06:03:21 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 46sbph5dge-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 May 2025 06:03:21 +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 54M5XZNX024709 for ; Thu, 22 May 2025 06:03:20 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46rwkr82t8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 May 2025 06:03:20 +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 54M63JG231982090 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 May 2025 06:03:20 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9A4545805A for ; Thu, 22 May 2025 06:03:19 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B0895803F for ; Thu, 22 May 2025 06:03:19 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.ibm.com.com (unknown [9.67.133.17]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP for ; Thu, 22 May 2025 06:03:19 +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=omWB89EnafFswESRm EKOcBlKElf56yuKODeMWADPR5A=; b=QDx/a4I3iDDd7NTAvX87rwlGhgsfxXTRt dRiWbQHk36Vh6LZfMzQYGfpQpQAYOwXpCgsY+E7G48RGWgIVuGjPNZQke8ClNDiz +R6sJaUVvJvmBkEcCgclDwRwMnMW+usS+AgGNqHNUC3pcpe3irq4yiLE7NbGwoIR clQu8sszMOwRRUTUrpplMEHbl2oI5sgZXdo0AibOYGG4A9EekZKMMq+CLMsB3lLQ /S0VFni4EQIWjzkAZnAd6bTuZBBDs9FOJ+N8XhrvQG3RHdSMqA7j2bDc7n/bbV2I eSqVKrVGxd5TLDqfHJgPuN+r+iwQU9WVhzjuROeYOPvaAeDjOgbDA== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v3 2/3] qemu: process: refactor deprecated features code Date: Thu, 22 May 2025 02:03:15 -0400 Message-ID: <20250522060316.217730-3-walling@linux.ibm.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250522060316.217730-1-walling@linux.ibm.com> References: <20250522060316.217730-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDA1NCBTYWx0ZWRfXxj6IiRwl2Qnj vRpzrLnXSo0Go6suSxYQCrU03GPAJTimPYCCW+YdTomnYqM/0aXKJRYyt++UF/C9x2W+tCJKCuM BSsRscpkVy0qATAZCXls9oS4wRL0m12z3HLrBDpQXo93F6k+uX/FEaeddbVkw2QnvJJtKSdN2JN iPZdiotaHQ6ES8c4IKXmTQx6h9P2Sl3sgh7+wDYYxDwg14tj+Kbk6dH8yXRvD01Fplyn6YPlFm9 vCLJAAjVvIldOGH8T9I0sf2l9l6fTTeecJv+vjNbiZ6nA7cBdjUOAKBTFtSnPguOOGYUHtJ7ggL EZsjUELbngBCzRHl0ekBMGpibLYl9M4cY78vZJ6OJMgRhiCFyOk5vhIguTPzrKZEphIWr6PoF0a 5Ea9uaIjVqpBoIwvxQ8GxS/zXlooXhjNqk5NXWkHc+ax40SUgAOoGB/RpogyJErXQwckBI7H X-Proofpoint-ORIG-GUID: fLLV5i-cCWF3x_XcAPbO6hEa_VI8rvX_ X-Authority-Analysis: v=2.4 cv=L5kdQ/T8 c=1 sm=1 tr=0 ts=682ebe29 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=wPMzV5M0OsZwT5GRDksA:9 X-Proofpoint-GUID: fLLV5i-cCWF3x_XcAPbO6hEa_VI8rvX_ 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_03,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=738 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-2505220054 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W2W6ZLLN73FP3QFBRN4YG6ST743WSFKZ X-Message-ID-Hash: W2W6ZLLN73FP3QFBRN4YG6ST743WSFKZ 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: 1747893853079116600 Content-Type: text/plain; charset="utf-8" Group up the deprecated features code into a single block to keep things clean; only check if the deprecated_features attribute is present once and then do relevent work. Signed-off-by: Collin Walling Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_process.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e4f8cb8c01..b4989f7ab8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6588,19 +6588,18 @@ 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", - _("toggling deprecated features for CPU model is un= supported")); - return -1; - } - if (def->cpu->deprecated_feats) { =20 virCPUFeaturePolicy policy =3D VIR_CPU_FEATURE_REQUIRE; if (def->cpu->deprecated_feats =3D=3D VIR_TRISTATE_SWITCH_OFF) policy =3D VIR_CPU_FEATURE_DISABLE; =20 + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_= DEPRECATED_PROPS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("toggling deprecated features for CPU model i= s unsupported")); + return -1; + } + virQEMUCapsUpdateCPUDeprecatedFeatures(qemuCaps, def->virtType, def->cpu, policy); } --=20 2.47.1