From nobody Fri Nov 21 10:08:31 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=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1763678271; cv=none; d=zohomail.com; s=zohoarc; b=MRPxV7VleqDQ9RHvnCnwi6rEW1tyjQ2d5JUvDg5BQRjrAo6fqNj/YotMk5/UDna7KgeCRUXZAPfdC/KWTl0VDsbAo77mv9inXTSypHK1pz/USTgOTJwLbSpxHm52cQu/vVm/4gMj4fOgeQc5UXr1w1RNVdKNDPBrVk1A79gzjFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763678271; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=gxYiZV3UkJPG9FBxyIYPgj+eOsXlef/A61sWHiqODbA=; b=bY2Abh+8bx3XRiVt+OEVMS+deWg6UH0V4gaaNgMYqUIkJ7Gr4kGFE95RBHuibBmYeqFfAfOZXBch0HiJ+UemvHSG9Yd0xaOPg0JZSmq0f57k/sWFdgaATip/sQyVDhTChRpufx9nebcfr5ZcRFppqruKuLF74puizQSk8B1v850= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1763678271657910.2855724823589; Thu, 20 Nov 2025 14:37:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2B6D74438E; Thu, 20 Nov 2025 17:37:51 -0500 (EST) Received: from [172.19.199.53] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CB72744291; Thu, 20 Nov 2025 17:36:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id AA38844125; Thu, 20 Nov 2025 17:35:05 -0500 (EST) 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 21D5844121 for ; Thu, 20 Nov 2025 17:35:00 -0500 (EST) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AKCw5eF013736 for ; Thu, 20 Nov 2025 22:34:59 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 4aejgx7hff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Nov 2025 22:34:59 +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 5AKKAADx005118 for ; Thu, 20 Nov 2025 22:34:59 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4af5bkh01k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Nov 2025 22:34:58 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5AKMYwWP5964396 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 20 Nov 2025 22:34:58 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3EB0A5806B for ; Thu, 20 Nov 2025 22:34:58 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 100C25806D for ; Thu, 20 Nov 2025 22:34:58 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.pok.ibm.com (unknown [9.12.68.85]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP for ; Thu, 20 Nov 2025 22:34:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 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=gxYiZV3UkJPG9FBxy IYPgj+eOsXlef/A61sWHiqODbA=; b=Up1QlQscu9aIcVuR5roxf6MqtOk99+LsG 34gSA18peCAEj94u8PKYAdHl68bZ8rkQTqCLgcvwKNZgkRYemnpYPfIs3tCPifKj aw3JSNBNgtRAneAcOK9x6WtZeyzVAHcdGN0ikjlXtRgU96PgXRrheFmm2gD4RZQr d/A62xWwi+7FUS2GttOXj/CWfbqV1D+BKHmVKmNE6OuaWsNlrP80IxF6z6cvXN2+ LWC+BugAj5nWwXq8Z+y0vsgLxZziM912oZD0GHjbJvuWFQTI/KQYUE3jZJZ2XJwA cPBbLeZQK8lxsNQ+mN1d0cjPO4vSX3WnMSbyBO4Hxgu/iYbMcQ+wg== From: Collin Walling To: devel@lists.libvirt.org Subject: [PATCH v1 1/4] qemu: rename modelinfo's deprecated_props to full_dep_props Date: Thu, 20 Nov 2025 17:34:40 -0500 Message-ID: <20251120223443.45446-2-walling@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120223443.45446-1-walling@linux.ibm.com> References: <20251120223443.45446-1-walling@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: wjAJvwwZRctvi5sf4fNaixxGeT89kYYa X-Authority-Analysis: v=2.4 cv=YqwChoYX c=1 sm=1 tr=0 ts=691f9793 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=K8gv1na5YGQBj6Gsb9sA:9 X-Proofpoint-ORIG-GUID: wjAJvwwZRctvi5sf4fNaixxGeT89kYYa X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMiBTYWx0ZWRfXyE/N6ykN5zPV /bdKjXUF4HegVNJ7SH7mmH8lC7Gzg/CaNm7JzpadjM2TZnBtW2k6JDU1qlsFAxSaEhItxjREPTE zAY4uxhdlMDrQ8MS4M0OilaS0Z4f9hFGtJT+bjD0R9ia0f8u9C0gKMO3hq5KbTsC04eU6s+i4ub cEKBanPY7EevSXeAmS8ra1mabbaGjiyLHsrUwl2pCRiL3Rs21ue7dUQiVsgCo9+u1F/P19CDiCd rqpDVbowAVG/zP8z+0jiGJyoK8HPRMyFQ+tRP+D0jRG/o7RQLhzq/Z3w4QCjWIFaW9HUTrSG4zs lD7EEwhM6bUaGh04vv2L2FRGY/tgdWIcsHyf582pf+H8r/E8/t5gJfDIOoZPJXB0j3fO49PQ2G3 UNct3gOF0+MoJvGf0W0xqGAoJxripw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-20_09,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511150032 Message-ID-Hash: LCZAT77RYDEROMY5OQ4WEGGITO73U6HX X-Message-ID-Hash: LCZAT77RYDEROMY5OQ4WEGGITO73U6HX X-MailFrom: walling@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1763678272098018900 Content-Type: text/plain; charset="utf-8" The current query of deprecated properties is the result of a full model expansion. Rename the field to reflect this. Signed-off-by: Collin Walling --- src/qemu/qemu_capabilities.c | 22 +++++++++++----------- src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 205bf3d0b8..bcc7c5b602 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3275,9 +3275,9 @@ virQEMUCapsProbeFullDeprecatedProperties(qemuMonitor = *mon, cpu, true, false, false, &propsInf= o) < 0) return -1; =20 - if (propsInfo && propsInfo->deprecated_props) { + if (propsInfo && propsInfo->full_dep_props) { g_strfreev(*props); - *props =3D g_steal_pointer(&propsInfo->deprecated_props); + *props =3D g_steal_pointer(&propsInfo->full_dep_props); } =20 return 0; @@ -3366,7 +3366,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, } =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRE= CATED_PROPS) && - virQEMUCapsProbeFullDeprecatedProperties(mon, cpu, &modelInfo->dep= recated_props) < 0) + virQEMUCapsProbeFullDeprecatedProperties(mon, cpu, &modelInfo->ful= l_dep_props) < 0) return -1; =20 if (virQEMUCapsTypeIsAccelerated(virtType) && @@ -3441,11 +3441,11 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps = *qemuCaps, =20 modelInfo =3D virQEMUCapsGetCPUModelInfo(qemuCaps, virtType); =20 - if (!modelInfo || !modelInfo->deprecated_props) + if (!modelInfo || !modelInfo->full_dep_props) return; =20 - for (i =3D 0; i < g_strv_length(modelInfo->deprecated_props); i++) { - virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i], policy= ); + for (i =3D 0; i < g_strv_length(modelInfo->full_dep_props); i++) { + virCPUDefUpdateFeature(cpu, modelInfo->full_dep_props[i], policy); } } =20 @@ -4210,12 +4210,12 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *c= aps, if ((deprecated_props =3D virXPathNode("./deprecatedFeatures", ctxt)))= { g_autoptr(GPtrArray) props =3D virXMLNodeGetSubelementList(depreca= ted_props, NULL); =20 - hostCPU->deprecated_props =3D g_new0(char *, props->len + 1); + hostCPU->full_dep_props =3D g_new0(char *, props->len + 1); =20 for (i =3D 0; i < props->len; i++) { xmlNodePtr prop =3D g_ptr_array_index(props, i); =20 - if (!(hostCPU->deprecated_props[i] =3D virXMLPropString(prop, = "name"))) { + if (!(hostCPU->full_dep_props[i] =3D virXMLPropString(prop, "n= ame"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing 'name' attribute for a host CPU = model deprecated property in QEMU capabilities cache")); return -1; @@ -4979,13 +4979,13 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsAccel = *caps, virBufferAddLit(buf, "/>\n"); } =20 - if (model->deprecated_props) { + if (model->full_dep_props) { virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, 2); =20 - for (i =3D 0; i < g_strv_length(model->deprecated_props); i++) + for (i =3D 0; i < g_strv_length(model->full_dep_props); i++) virBufferAsprintf(buf, "\n", - model->deprecated_props[i]); + model->full_dep_props[i]); =20 virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0f1a9d13f5..bcedd96f4e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3374,7 +3374,7 @@ qemuMonitorCPUModelInfoFree(qemuMonitorCPUModelInfo *= model_info) g_free(model_info->props[i].value.string); } =20 - g_strfreev(model_info->deprecated_props); + g_strfreev(model_info->full_dep_props); g_free(model_info->props); g_free(model_info->name); g_free(model_info); @@ -3419,7 +3419,7 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModel= Info *orig) } } =20 - copy->deprecated_props =3D g_strdupv(orig->deprecated_props); + copy->full_dep_props =3D g_strdupv(orig->full_dep_props); =20 return copy; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index dd038f2775..6cd9329787 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1430,7 +1430,7 @@ struct _qemuMonitorCPUModelInfo { char *name; size_t nprops; qemuMonitorCPUProperty *props; - GStrv deprecated_props; + GStrv full_dep_props; /* deprecated properties resulting from a full= model expansion */ bool migratability; }; =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a4cbc222a8..e911c1929c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5401,7 +5401,7 @@ qemuMonitorJSONParseCPUModelExpansion(const char *cpu= _name, =20 if (cpu_deprecated_props && virJSONValueArraySize(cpu_deprecated_props) && - (!(expanded_model->deprecated_props =3D virJSONValueArrayToStringL= ist(cpu_deprecated_props)))) { + (!(expanded_model->full_dep_props =3D virJSONValueArrayToStringLis= t(cpu_deprecated_props)))) { return -1; } =20 --=20 2.51.1