Re: [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}()

[Marc-André Lureau]

Hi

On Thu, Jan 23, 2020 at 3:29 PM Paolo Bonzini <address@hidden> wrote:
>
> This patch caught my attention because of the typo in the function, but

Ah! a french "défaut".

> I also noticed that get_default is never set to anything but
> object_property_get_defval.
>
> What do you think about removing the method and just relying on defval?
> In practice there would be a new patch that squashes 7, 10 and the thing
> after my signature.

Indeed, we could remove the get_default callback. I can't find the
reason I added it now.

Are you resending the series then?

>
> Paolo
>
> diff --git a/include/qom/object.h b/include/qom/object.h
> index 1ea5c8c..035e41c 100644
> --- a/include/qom/object.h
> +++ b/include/qom/object.h
> @@ -367,13 +367,6 @@ typedef void (ObjectPropertyRelease)(Object *obj,
>   */
>  typedef void (ObjectPropertyInit)(Object *obj, ObjectProperty *prop);
>
> -/**
> - * ObjectPropertyGetDefault:
> - *
> - * Get an allocated string representation of the default value.
> - */
> -typedef char *(ObjectPropertyGetDefault)(ObjectProperty *prop);
> -
>  struct ObjectProperty
>  {
>      gchar *name;
> @@ -384,7 +377,6 @@ struct ObjectProperty
>      ObjectPropertyResolve *resolve;
>      ObjectPropertyRelease *release;
>      ObjectPropertyInit *init;
> -    ObjectPropertyGetDefault *get_default;
>      void *opaque;
>      QObject *defval;
>  };
> diff --git a/qom/object.c b/qom/object.c
> index 2464a9f..aa6cf19 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -1444,15 +1444,6 @@ int64_t object_property_get_int(Object *obj, const 
> char *name,
>      return retval;
>  }
>
> -char *object_property_get_default(ObjectProperty *prop)
> -{
> -    if (!prop->get_default) {
> -        return NULL;
> -    }
> -
> -    return prop->get_default(prop);
> -}
> -
>  static void object_property_init_defval(Object *obj, ObjectProperty *prop)
>  {
>      Visitor *v = qobject_input_visitor_new(prop->defval);
> @@ -1463,8 +1454,12 @@ static void object_property_init_defval(Object *obj, 
> ObjectProperty *prop)
>      visit_free(v);
>  }
>
> -static char *object_property_get_defval(ObjectProperty *prop)
> +char *object_property_get_default(ObjectProperty *prop)
>  {
> +    if (!prop->defval) {
> +        return NULL;
> +    }
> +
>      return qstring_free(qobject_to_json(prop->defval), TRUE);
>  }
>
> @@ -1472,11 +1467,9 @@ static void object_property_set_default(ObjectProperty 
> *prop, QObject *defval)
>  {
>      assert(!prop->defval);
>      assert(!prop->init);
> -    assert(!prop->get_default);
>
>      prop->defval = defval;
>      prop->init = object_property_init_defval;
> -    prop->get_default = object_property_get_defval;
>  }
>
>  void object_property_set_default_bool(ObjectProperty *prop, bool value)
> @@ -2610,8 +2603,7 @@ void object_property_add_alias(Object *obj, const char 
> *name,
>          goto out;
>      }
>      op->resolve = property_resolve_alias;
> -    if (target_prop->get_default) {
> -        op->get_default = target_prop->get_default;
> +    if (target_prop->defval) {
>          op->defval = qobject_ref(target_prop->defval);
>      }
>
>
>


-- 
Marc-André Lureau