From nobody Tue Sep 9 23:35:26 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 1749821762321294.2425259765182; Fri, 13 Jun 2025 06:36:02 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4E8BF135E; Fri, 13 Jun 2025 09:36:01 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E19C3132D; Fri, 13 Jun 2025 09:33:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4F391D80; 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 49D90D80 for ; Fri, 13 Jun 2025 09:33:26 -0400 (EDT) Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55D5Txs1004386 for ; Fri, 13 Jun 2025 13:33:25 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474dv819tu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Jun 2025 13:33:25 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55DC1Du5003463 for ; Fri, 13 Jun 2025 13:33:24 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4751ym20ra-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 55DDXM7K16450116 (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 5199758061; 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 172EA5805A; 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=QpG2rstu09vgD8D91 Q2JS/hZh79uIyXPPVClFxYGqIE=; b=bw7nrThZgO7Ze5I2Vu2qziIWBU/bQZB4a 3wWBRbYHGTFrfLJkR+ealvha40jtDyKH3p4a71cIlgMrTrSR6Alzdnwp4HE0Kdij ZIRoJI6+2Ep2+HTWdRofuOUyflbCVFR2vwrfj7DR0B5/L4LypiEtx+Y8TP7OTjto /yx9lbDaeu2TiV1LTUXl3BPiO1KhAhgcqnnH8jtM3ALLWZ1+UICxUUJTZX1Dtfdc tcdS4ORIV9cIiL47ZnI1YcHUnBfxR/GVqIW6E/ypNkA3L2LYmNRLX0Ks7zRNdzq+ aXMk3fy3DE8xVyJEmSQGi8lw6UIYb1g/8MucacGLU8Ol5VsAXVGOg== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v4 3/5] qemu: process: refactor deprecated features code Date: Fri, 13 Jun 2025 09:33:13 -0400 Message-ID: <20250613133315.41095-4-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: YhdnkDYxejtY2kR_6MTX5lpO2a-3_ksa X-Proofpoint-GUID: YhdnkDYxejtY2kR_6MTX5lpO2a-3_ksa X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEzMDA5NyBTYWx0ZWRfX3W4hVniG5xAS mNCJSamW+q6JmMFzE+v9aH/gXTz8kDlrwPtVArRsPsnl3/VQFqdBgBS7gAOXVk9PAqBbBKR8wPE 6kQ6SJ+hl8sWlZNjtYKkV+ksHveTkd1j+RYaaSsWgGD9Kn1uucbIprI0lHZuwVRbaLG4HdSqLU/ PEkE5MZOQVhwvsmZTt9UGbYto75OWciEcd9WaXWX4aDjlChXJb0Y8I9983Y5qNURdcDVyYXvjDn TCi96DR5UG7408x2zlez8pQnCRJcebGKT6I2sNobY2OVyCiVHGh79cpjufT2iwmf3lqca/LKTEy K/ok+pZkn33fduE15lv9Hrdw0Y0B5F0qwiNugm+vH6xwECYW8nKnRRn6B2mbkawwFpMwXCenCk4 8ZaZPLBFiO4zYIpJ8PMtt4/rxAPj6ykEuqt9U6BKMFwzCXtyw5jHATHxqCDE1X1WaeM+EGsh X-Authority-Analysis: v=2.4 cv=CfMI5Krl c=1 sm=1 tr=0 ts=684c28a5 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=wPMzV5M0OsZwT5GRDksA:9 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 bulkscore=0 spamscore=0 phishscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 mlxscore=0 suspectscore=0 mlxlogscore=787 adultscore=0 malwarescore=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: BUOYIA2BIDTUPNNFFHFSPKO24JPSRNNO X-Message-ID-Hash: BUOYIA2BIDTUPNNFFHFSPKO24JPSRNNO 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: 1749821764319116600 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 c05aa05a5a..8e3b5cda88 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6588,18 +6588,17 @@ 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) { 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