Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com> On 11/20/25 23:34, Collin Walling wrote:
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 <walling@linux.ibm.com> --- 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, &propsInfo) < 0) return -1;
- if (propsInfo && propsInfo->deprecated_props) { + if (propsInfo && propsInfo->full_dep_props) { g_strfreev(*props); - *props = g_steal_pointer(&propsInfo->deprecated_props); + *props = g_steal_pointer(&propsInfo->full_dep_props); }
return 0; @@ -3366,7 +3366,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_DEPRECATED_PROPS) && - virQEMUCapsProbeFullDeprecatedProperties(mon, cpu, &modelInfo->deprecated_props) < 0) + virQEMUCapsProbeFullDeprecatedProperties(mon, cpu, &modelInfo->full_dep_props) < 0) return -1;
if (virQEMUCapsTypeIsAccelerated(virtType) && @@ -3441,11 +3441,11 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps,
modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, virtType);
- if (!modelInfo || !modelInfo->deprecated_props) + if (!modelInfo || !modelInfo->full_dep_props) return;
- for (i = 0; i < g_strv_length(modelInfo->deprecated_props); i++) { - virCPUDefUpdateFeature(cpu, modelInfo->deprecated_props[i], policy); + for (i = 0; i < g_strv_length(modelInfo->full_dep_props); i++) { + virCPUDefUpdateFeature(cpu, modelInfo->full_dep_props[i], policy); } }
@@ -4210,12 +4210,12 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *caps, if ((deprecated_props = virXPathNode("./deprecatedFeatures", ctxt))) { g_autoptr(GPtrArray) props = virXMLNodeGetSubelementList(deprecated_props, NULL);
- hostCPU->deprecated_props = g_new0(char *, props->len + 1); + hostCPU->full_dep_props = g_new0(char *, props->len + 1);
for (i = 0; i < props->len; i++) { xmlNodePtr prop = g_ptr_array_index(props, i);
- if (!(hostCPU->deprecated_props[i] = virXMLPropString(prop, "name"))) { + if (!(hostCPU->full_dep_props[i] = virXMLPropString(prop, "name"))) { 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"); }
- if (model->deprecated_props) { + if (model->full_dep_props) { virBufferAddLit(buf, "<deprecatedFeatures>\n"); virBufferAdjustIndent(buf, 2);
- for (i = 0; i < g_strv_length(model->deprecated_props); i++) + for (i = 0; i < g_strv_length(model->full_dep_props); i++) virBufferAsprintf(buf, "<property name='%s'/>\n", - model->deprecated_props[i]); + model->full_dep_props[i]);
virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</deprecatedFeatures>\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); }
- 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 qemuMonitorCPUModelInfo *orig) } }
- copy->deprecated_props = g_strdupv(orig->deprecated_props); + copy->full_dep_props = g_strdupv(orig->full_dep_props);
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; };
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,
if (cpu_deprecated_props && virJSONValueArraySize(cpu_deprecated_props) && - (!(expanded_model->deprecated_props = virJSONValueArrayToStringList(cpu_deprecated_props)))) { + (!(expanded_model->full_dep_props = virJSONValueArrayToStringList(cpu_deprecated_props)))) { return -1; }
-- Mit freundlichen Grüßen/Kind regards Boris Fiuczynski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294