Re: [Qemu-devel] [PATCH v2 09/10] qdev: Remove qdev_prop_register_global_list()

[Marcel Apfelbaum]

On 06/20/2016 06:53 PM, Eduardo Habkost wrote:
> The function is not used by any QEMU code, except for the
> test-qdev-global-props unit test.
>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> Changes v1 -> v2:
> * (New patch in series)
> ---
>   hw/core/qdev-properties.c      |  9 ---------
>   include/hw/qdev-properties.h   |  1 -
>   tests/test-qdev-global-props.c | 12 ++++++------
>   3 files changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 733cc45..cf1d47f 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1027,15 +1027,6 @@ void qdev_prop_register_global(GlobalProperty *prop)
>       global_props = g_list_append(global_props, prop);
>   }
>
> -void qdev_prop_register_global_list(GlobalProperty *props)
> -{
> -    int i;
> -
> -    for (i = 0; props[i].driver != NULL; i++) {
> -        qdev_prop_register_global(props+i);
> -    }
> -}
> -
>   static void qdev_prop_set_globals_for_type(DeviceState *dev,
>                                   const char *typename)
>   {
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index 3bd5ea9..3d25c00 100644
> --- a/include/hw/qdev-properties.h
> +++ b/include/hw/qdev-properties.h
> @@ -190,7 +190,6 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, 
> int value);
>   void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
>
>   void qdev_prop_register_global(GlobalProperty *prop);
> -void qdev_prop_register_global_list(GlobalProperty *props);
>   void qdev_prop_set_globals(DeviceState *dev);
>   void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
>                                       Property *prop, const char *value);
> diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c
> index 37394fa..29c704f 100644
> --- a/tests/test-qdev-global-props.c
> +++ b/tests/test-qdev-global-props.c
> @@ -78,12 +78,9 @@ static void test_static_prop(void)
>   static void test_static_globalprop(void)
>   {
>       MyType *mt;
> -    static GlobalProperty props[] = {
> -        { TYPE_STATIC_PROPS, "prop1", "200" },
> -        {}
> -    };
> +    static GlobalProperty prop = { TYPE_STATIC_PROPS, "prop1", "200" };
>
> -    qdev_prop_register_global_list(props);
> +    qdev_prop_register_global(&prop);
>
>       mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS));
>       qdev_init_nofail(DEVICE(mt));
> @@ -182,6 +179,7 @@ static const TypeInfo nondevice_type = {
>   static void test_dynamic_globalprop(void)
>   {
>       MyType *mt;
> +    int i;
>       static GlobalProperty props[] = {
>           { TYPE_DYNAMIC_PROPS, "prop1", "101", },
>           { TYPE_DYNAMIC_PROPS, "prop2", "102", },
> @@ -190,7 +188,9 @@ static void test_dynamic_globalprop(void)
>           {}
>       };
>
> -    qdev_prop_register_global_list(props);
> +    for (i = 0; props[i].driver; i++) {
> +        qdev_prop_register_global(props + i);
> +    }
>
>       mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));
>       qdev_init_nofail(DEVICE(mt));

Reviewed-by: Marcel Apfelbaum <address@hidden>

Thanks,
Marcel