Re: [Qemu-devel] [PATCH 07/22] qom: allow object_class_foreach to take additional parameters to refine search

[Andreas Färber]

Am 01.02.2012 20:50, schrieb Anthony Liguori:
> Signed-off-by: Anthony Liguori <address@hidden>

Reviewed-by: Andreas Färber <address@hidden>

Thanks,
Andreas

> ---
>  include/qemu/object.h |    1 +
>  qom/object.c          |   18 ++++++++++++++++--
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/include/qemu/object.h b/include/qemu/object.h
> index ba37850..adbcfb1 100644
> --- a/include/qemu/object.h
> +++ b/include/qemu/object.h
> @@ -431,6 +431,7 @@ const char *object_class_get_name(ObjectClass *klass);
>  ObjectClass *object_class_by_name(const char *typename);
>  
>  void object_class_foreach(void (*fn)(ObjectClass *klass, void *opaque),
> +                          const char *implements_type, bool include_abstract,
>                            void *opaque);
>  
>  #endif
> diff --git a/qom/object.c b/qom/object.c
> index a12895f..3dabb1a 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -467,6 +467,8 @@ ObjectClass *object_class_by_name(const char *typename)
>  typedef struct OCFData
>  {
>      void (*fn)(ObjectClass *klass, void *opaque);
> +    const char *implements_type;
> +    bool include_abstract;
>      void *opaque;
>  } OCFData;
>  
> @@ -475,16 +477,28 @@ static void object_class_foreach_tramp(gpointer key, 
> gpointer value,
>  {
>      OCFData *data = opaque;
>      TypeImpl *type = value;
> +    ObjectClass *k;
>  
>      type_class_init(type);
> +    k = type->class;
>  
> -    data->fn(value, type->class);
> +    if (!data->include_abstract && type->abstract) {
> +        return;
> +    }
> +
> +    if (data->implements_type && 
> +        !object_class_dynamic_cast(k, data->implements_type)) {
> +        return;
> +    }
> +
> +    data->fn(k, data->opaque);
>  }
>  
>  void object_class_foreach(void (*fn)(ObjectClass *klass, void *opaque),
> +                          const char *implements_type, bool include_abstract,
>                            void *opaque)
>  {
> -    OCFData data = { fn, opaque };
> +    OCFData data = { fn, implements_type, include_abstract, opaque };
>  
>      g_hash_table_foreach(type_table_get(), object_class_foreach_tramp, 
> &data);
>  }

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg