mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/s390x: filter deprecated properties based on model expansion type

Browse Source 
Currently, there is no way to execute the query-cpu-model-expansion
command to retrieve a comprehenisve list of deprecated properties, as
the result is dependent per-model. To enable this, the expansion output
is modified as such:

When reporting a "full" CPU model, show the *entire* list of deprecated
properties regardless if they are supported on the model. A full
expansion outputs all known CPU model properties anyway, so it makes
sense to report all deprecated properties here too.

This allows management apps to query a single model (e.g. host) to
acquire the full list of deprecated properties.

Additionally, when reporting a "static" CPU model, the command will
only show deprecated properties that are a subset of the model's
*enabled* properties. This is more accurate than how the query was
handled before, which blindly reported deprecated properties that
were never otherwise introduced for certain models.

Acked-by: David Hildenbrand <david@redhat.com>
Suggested-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Collin Walling <walling@linux.ibm.com>
Message-ID: <20240719181741.35146-1-walling@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Collin Walling 2024-07-19 14:17:41 -04:00 committed by Thomas Huth
parent 2d9588ad70
commit eed0e8ffa3
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qapi/machine-target.json
View File

@ -21,8 +21,9 @@
# @props: a dictionary of QOM properties to be applied # @props: a dictionary of QOM properties to be applied
# #
# @deprecated-props: a list of properties that are flagged as deprecated # @deprecated-props: a list of properties that are flagged as deprecated
# by the CPU vendor. These props are a subset of the full model's # by the CPU vendor. These properties are either a subset of the
# definition list of properties. (since 9.1) # properties enabled on the CPU model, or a set of properties
# deprecated across all models for the architecture.
# #
# Since: 2.8 # Since: 2.8
## ##

16
target/s390x/cpu_models_sysemu.c
View File

@ -174,11 +174,15 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model,
bool delta_changes) bool delta_changes)
{ {
QDict *qdict = qdict_new(); QDict *qdict = qdict_new();
S390FeatBitmap bitmap; S390FeatBitmap bitmap, deprecated;
/* always fallback to the static base model */ /* always fallback to the static base model */
info->name = g_strdup_printf("%s-base", model->def->name); info->name = g_strdup_printf("%s-base", model->def->name);
/* features flagged as deprecated */
bitmap_zero(deprecated, S390_FEAT_MAX);
s390_get_deprecated_features(deprecated);
if (delta_changes) { if (delta_changes) {
/* features deleted from the base feature set */ /* features deleted from the base feature set */
bitmap_andnot(bitmap, model->def->base_feat, model->features, bitmap_andnot(bitmap, model->def->base_feat, model->features,
@ -193,6 +197,9 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model,
if (!bitmap_empty(bitmap, S390_FEAT_MAX)) { if (!bitmap_empty(bitmap, S390_FEAT_MAX)) {
s390_feat_bitmap_to_ascii(bitmap, qdict, qdict_add_enabled_feat); s390_feat_bitmap_to_ascii(bitmap, qdict, qdict_add_enabled_feat);
} }
/* deprecated features that are a subset of the model's enabled features */
bitmap_and(deprecated, deprecated, model->features, S390_FEAT_MAX);
} else { } else {
/* expand all features */ /* expand all features */
s390_feat_bitmap_to_ascii(model->features, qdict, s390_feat_bitmap_to_ascii(model->features, qdict,
@ -207,12 +214,7 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model,
info->props = QOBJECT(qdict); info->props = QOBJECT(qdict);
} }
/* features flagged as deprecated */ s390_feat_bitmap_to_ascii(deprecated, &info->deprecated_props, list_add_feat);
bitmap_zero(bitmap, S390_FEAT_MAX);
s390_get_deprecated_features(bitmap);
bitmap_and(bitmap, bitmap, model->def->full_feat, S390_FEAT_MAX);
s390_feat_bitmap_to_ascii(bitmap, &info->deprecated_props, list_add_feat);
info->has_deprecated_props = !!info->deprecated_props; info->has_deprecated_props = !!info->deprecated_props;
} }