aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2025-05-22 12:05:35 -0700
committerMarkus Armbruster <armbru@redhat.com>2025-05-28 18:54:18 +0200
commit448553bb7c2a2fe518d7dc41c58a25d6d31831da (patch)
treeed15bdab81811ac0ab74cd89fe04c59d9272db6e
parent0a1f83c3fb63229a77e2d0c5f1fe5d7e09dbf3b7 (diff)
downloadqemu-448553bb7c2a2fe518d7dc41c58a25d6d31831da.zip
qemu-448553bb7c2a2fe518d7dc41c58a25d6d31831da.tar.gz
qemu-448553bb7c2a2fe518d7dc41c58a25d6d31831da.tar.bz2
qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic
We'd like to have some unified QAPI schema. Having a structure field conditional to a target being built in is not very practical. While @deprecated-props is only used by s390x target, it is generic enough and could be used by other targets (assuming we expand CpuModelExpansionType enum values). Let's always include this field, regardless of the target, but make it optional. This is not a compatibility break only because the field remains present always on S390x. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Message-ID: <20250522190542.588267-9-pierrick.bouvier@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--qapi/machine-target.json7
1 files changed, 3 insertions, 4 deletions
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index 426ce4e..d8dbda4 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -244,19 +244,18 @@
#
# @model: the expanded CpuModelInfo.
#
-# @deprecated-props: a list of properties that are flagged as
+# @deprecated-props: an optional list of properties that are flagged as
# deprecated by the CPU vendor. The list depends on the
# CpuModelExpansionType: "static" properties are a subset of the
# enabled-properties for the expanded model; "full" properties are
# a set of properties that are deprecated across all models for
-# the architecture. (since: 9.1).
+# the architecture. (since: 10.1 -- since 9.1 on s390x --).
#
# Since: 2.8
##
{ 'struct': 'CpuModelExpansionInfo',
'data': { 'model': 'CpuModelInfo',
- 'deprecated-props' : { 'type': ['str'],
- 'if': 'TARGET_S390X' } },
+ '*deprecated-props' : ['str'] },
'if': { 'any': [ 'TARGET_S390X',
'TARGET_I386',
'TARGET_ARM',