Eduardo Habkost <ehabkost@xxxxxxxxxx> writes:
> The new typename attribute on query-cpu-definitions will be used
> to help management software use device-list-properties to check
> which properties can be set using -cpu or -global for the CPU
> model.
>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
> ---
> qapi-schema.json | 4 +++-
> target-arm/helper.c | 1 +
> target-i386/cpu.c | 1 +
> target-ppc/translate_init.c | 1 +
> target-s390x/cpu_models.c | 1 +
> 5 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index b0b4bf6..9a3bdd4 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -3216,6 +3216,8 @@
> # @unavailable-features: #optional List of properties that prevent
> # the CPU model from running in the current
> # host. (since 2.8)
> +# @typename: Type name that can be used as argument to @device-list-properties,
> +# to introspect properties configurable using -cpu or -global.
> #
> # @unavailable-features is a list of QOM property names that
> # represent CPU model attributes that prevent the CPU from running.
> @@ -3237,7 +3239,7 @@
> ##
> { 'struct': 'CpuDefinitionInfo',
> 'data': { 'name': 'str', '*migration-safe': 'bool', 'static': 'bool',
> - '*unavailable-features': [ 'str' ] } }
> + '*unavailable-features': [ 'str' ], 'typename': 'str' } }
>
> ##
> # @query-cpu-definitions:
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index b5b65ca..3fc01b5 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -5207,6 +5207,7 @@ static void arm_cpu_add_definition(gpointer data, gpointer user_data)
> info = g_malloc0(sizeof(*info));
> info->name = g_strndup(typename,
> strlen(typename) - strlen("-" TYPE_ARM_CPU));
> + info->q_typename = g_strdup(typename);
>
> entry = g_malloc0(sizeof(*entry));
> entry->value = info;
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 6eec5dc..725f6cb 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -2239,6 +2239,7 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data)
> info->name = x86_cpu_class_get_model_name(cc);
> x86_cpu_class_check_missing_features(cc, &info->unavailable_features);
> info->has_unavailable_features = true;
> + info->q_typename = g_strdup(object_class_get_name(oc));
>
> entry = g_malloc0(sizeof(*entry));
> entry->value = info;
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 208fa1e..42b9274 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -10305,6 +10305,7 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
>
> info = g_malloc0(sizeof(*info));
> info->name = g_strdup(alias->alias);
> + info->q_typename = g_strdup(object_class_get_name(oc));
>
> entry = g_malloc0(sizeof(*entry));
> entry->value = info;
> diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c
> index c1e729d..5b66d33 100644
> --- a/target-s390x/cpu_models.c
> +++ b/target-s390x/cpu_models.c
> @@ -290,6 +290,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)
> info->has_migration_safe = true;
> info->migration_safe = scc->is_migration_safe;
> info->q_static = scc->is_static;
> + info->q_typename = g_strdup(object_class_get_name(klass));
>
>
> entry = g_malloc0(sizeof(*entry));
A bit sad that the QOM type name needs to be computed in
target-dependent code.
With Eric's doc fix:
Reviewed-by: Markus Armbruster <armbru@xxxxxxxxxx>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list