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 1747892102006331.74237710186867; Wed, 21 May 2025 22:35:02 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 167D31510; Thu, 22 May 2025 01:35:01 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3EC6515B1; Thu, 22 May 2025 01:33:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 036D9C62; Thu, 22 May 2025 01:33:40 -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 65F16135C for ; Thu, 22 May 2025 01:33:40 -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 54LIp8P6006801 for ; Thu, 22 May 2025 05:33:39 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46smf9aa61-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 (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54M570Pj032056 for ; Thu, 22 May 2025 05:33:38 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46rwmq7xyt-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 54M5XbFd32965294 (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 6FCE858065 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 4039B58052 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=omWB89EnafFswESRm EKOcBlKElf56yuKODeMWADPR5A=; b=h9ajLTq8vcGFXu9NtV7Wyr2qyPoyHfrIo q7fStfweuZUplJQo/qjMhZyEzXfjhGevneXsHFhfu9LrE9xcm+rRrZjh8pQanrtu Fay+U/4KhSp1GrrHqf05Z7yzbK/Nt2w5SqjxnIkJlkU/JIccswCmxtTt5zsYq75Z b3jK0euSehEJnu1ljqI3snw11Gp4I3s8pF87JmEcKXmgzr8u+6VFKNIwmvjXmkRm zsGvhlh62REErozdmcqsdDDzuGafiksPR0x/pAGitkFvGOsWZh9/TL3dN5APfCTM EYtYdPsavoUTCyMHNivLtiRMsk22fVWnVIH0P5jU1dVsvXyYRdovQ== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v2 2/3] qemu: process: refactor deprecated features code Date: Thu, 22 May 2025 01:33:24 -0400 Message-ID: <20250522053325.214083-3-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-GUID: XOG4Wv7UGwC8iBijBiMZK88YWuvYzjeI X-Proofpoint-ORIG-GUID: XOG4Wv7UGwC8iBijBiMZK88YWuvYzjeI X-Authority-Analysis: v=2.4 cv=TbqWtQQh c=1 sm=1 tr=0 ts=682eb733 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=wPMzV5M0OsZwT5GRDksA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDA0OCBTYWx0ZWRfXzU8SLSTm5ITk 1krD45ex4lL1GkAkHWDR5vAfG0wyPll5zxcGyjVtIzu3KgH5p8mey2JuRcWk09qReGMezi+IxEe BtFs79AZSaUcLfWUe9XXUeSc9vEloyIfEtwmcHiEXVV9AkAb6/4GmkVPscvtaEoEsKdYi5cJdNX +vIFxjmg3k70NG3KEBqFFSiy6djfx3zo440o19te+7Sk64bh9TyesjI+WVbeKCl5rAKrnJSuQYP 1LlC/8ZR8tTBQyNbrI2sXcQezB5PLRPHY15eS+pp5MCiXUJViByxDGH6b/UZSD7LUU6elQRASSb G2CoFyAzsokGz+hrjktTxeDooA3lopy4q8DJomF7nmg02FjTNhTEGvjDBvg19p4FDPbaY99UoR/ jjpTrXL18VUAWgJH12xwIualjXlQaQ97cbsVWaDI+rTbzOVupCZW5SOeQ+4fjBovkRZWZeFF 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 mlxscore=0 bulkscore=0 phishscore=0 adultscore=0 spamscore=0 mlxlogscore=738 malwarescore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=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: WXD7TQ2PKNQSTEIKG5Z5IU62CDMFG2LP X-Message-ID-Hash: WXD7TQ2PKNQSTEIKG5Z5IU62CDMFG2LP 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: 1747892103839116600 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 --- 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