Re: [Qemu-devel] [PATCH 08/25] qdev: remove qdev_prop_set_defaults

[Anthony Liguori <anthony@codemonkey.ws>]

On 04/03/2012 06:15 AM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>


> ---
>   hw/qdev-properties.c |   22 ----------------------
>   hw/qdev.c            |   28 +++++++++++++++++++++++-----
>   hw/qdev.h            |    1 -
>   3 files changed, 23 insertions(+), 28 deletions(-)
>
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index bff9152..85897c7 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -1083,28 +1083,6 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value)
>       *ptr = value;
>   }
>
> -void qdev_prop_set_defaults(DeviceState *dev, Property *props)
> -{
> -    Object *obj = OBJECT(dev);
> -    if (!props)
> -        return;
> -    for (; props->name; props++) {
> -        Error *errp = NULL;
> -        if (props->qtype == QTYPE_NONE) {
> -            continue;
> -        }
> -        if (props->qtype == QTYPE_QBOOL) {
> -            object_property_set_bool(obj, props->defval, props->name,&errp);
> -        } else if (props->info->enum_table) {
> -            object_property_set_str(obj, props->info->enum_table[props->defval],
> -                                    props->name,&errp);
> -        } else if (props->qtype == QTYPE_QINT) {
> -            object_property_set_int(obj, props->defval, props->name,&errp);
> -        }
> -        assert_no_error(errp);
> -    }
> -}
> -
>   static QTAILQ_HEAD(, GlobalProperty) global_props = QTAILQ_HEAD_INITIALIZER(global_props);
>
>   static void qdev_prop_register_global(GlobalProperty *prop)
> diff --git a/hw/qdev.c b/hw/qdev.c
> index bb6c1aa..4ac5616 100644
> --- a/hw/qdev.c
> +++ b/hw/qdev.c
> @@ -90,7 +90,6 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus)
>           qdev_property_add_legacy(dev, prop, NULL);
>           qdev_property_add_static(dev, prop, NULL);
>       }
> -    qdev_prop_set_defaults(dev, dev->parent_bus->info->props);

Does this break bisectability?

Regards,

Anthony Liguori