> This adds:
>
> * a new boolean 'secure' field to the type info returned by
> qom-list-types, which will be set if the type provides a
> security boundary
>
> * a new boolean 'secure' parameter to the arguments of
> qom-list-types, which can be used to filter types based
> on their security status
>
> Signed-off-by: Daniel P. Berrangé <[email protected]>
> Message-ID: <[email protected]>
>
> diff --git a/qapi/qom.json b/qapi/qom.json
> index 4a9b7f908844..b14f063144b7 100644
> --- a/qapi/qom.json
> +++ b/qapi/qom.json
> @@ -210,12 +210,18 @@
> # @abstract: the type is abstract and can't be directly instantiated.
> # Omitted if false. (since 2.10)
> #
> +# @secure: the type provides a security boundary. Omitted if false.
> +# (since 11.2)
> +#
> # @parent: Name of parent type, if any (since 2.10)
> #
> # Since: 1.1
> ##
> { 'struct': 'ObjectTypeInfo',
> - 'data': { 'name': 'str', '*abstract': 'bool', '*parent': 'str' } }
> + 'data': { 'name': 'str',
> + '*abstract': 'bool',
> + '*parent': 'str',
> + '*secure': 'bool' } }
>
> ##
> # @qom-list-types:
> @@ -227,12 +233,15 @@
> #
> # @abstract: if true, include abstract types in the results
> #
> +# @secure: if set, filter to only include types with matching security
> +# status (since 11.1)
(since 11.2)
> +#
> # Returns: a list of types, or an empty list if no results are found
> #
> # Since: 1.1
> ##
> { 'command': 'qom-list-types',
> - 'data': { '*implements': 'str', '*abstract': 'bool' },
> + 'data': { '*implements': 'str', '*abstract': 'bool', '*secure': 'bool' },
> 'returns': [ 'ObjectTypeInfo' ],
> 'allow-preconfig': true }
>
> diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
> index b999e9f7238c..9474a1b04ba4 100644
> --- a/qom/qom-qmp-cmds.c
> +++ b/qom/qom-qmp-cmds.c
> @@ -153,6 +153,8 @@ QObject *qmp_qom_get(const char *path, const char
> *property, Error **errp)
>
> typedef struct {
> ObjectTypeInfoList *list;
> + bool has_secure;
> + bool secure;
> } ObjectTypeInfoData;
>
> static void qom_list_types_tramp(ObjectClass *klass, void *opaque)
> @@ -161,9 +163,15 @@ static void qom_list_types_tramp(ObjectClass *klass,
> void *opaque)
> ObjectTypeInfo *info;
> ObjectClass *parent = object_class_get_parent(klass);
>
> + if (data->has_secure &&
> + data->secure != object_class_is_secure(klass)) {
> + return;
> + }
> +
> info = g_malloc0(sizeof(*info));
> info->name = g_strdup(object_class_get_name(klass));
> info->has_abstract = info->abstract = object_class_is_abstract(klass);
> + info->has_secure = info->secure = object_class_is_secure(klass);
> if (parent) {
> info->parent = g_strdup(object_class_get_name(parent));
> }
> @@ -174,10 +182,14 @@ static void qom_list_types_tramp(ObjectClass *klass,
> void *opaque)
> ObjectTypeInfoList *qmp_qom_list_types(const char *implements,
> bool has_abstract,
> bool abstract,
> + bool has_secure,
> + bool secure,
> Error **errp)
> {
> ObjectTypeInfoData data = {
> .list = NULL,
> + .has_secure = has_secure,
> + .secure = secure,
> };
>
> module_load_qom_all();
Reviewed-by: Marc-André Lureau <[email protected]>
--
Marc-André Lureau <[email protected]>
