[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 10/26] object: add object_property_set_defaut_{bool, str, in
From: |
Marc-André Lureau |
Subject: |
Re: [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}() |
Date: |
Thu, 23 Jan 2020 15:39:27 +0400 |
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
- [PATCH 03/26] qdev: remove extraneous error, (continued)
- [PATCH 03/26] qdev: remove extraneous error, Marc-André Lureau, 2020/01/10
- [PATCH 04/26] qdev: move helper function to monitor/misc, Marc-André Lureau, 2020/01/10
- [PATCH 05/26] object: avoid extra class property key duplication, Marc-André Lureau, 2020/01/10
- [PATCH 06/26] object: add class property initializer, Marc-André Lureau, 2020/01/10
- [PATCH 07/26] object: add object_property_get_defaut(), Marc-André Lureau, 2020/01/10
- [PATCH 08/26] object: make object_class_property_add* return property, Marc-André Lureau, 2020/01/10
- [PATCH 09/26] qstring: add qstring_free(), Marc-André Lureau, 2020/01/10
- [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}(), Marc-André Lureau, 2020/01/10
- [PATCH 11/26] object: do not free class properties, Marc-André Lureau, 2020/01/10
- [PATCH 12/26] object: check strong flag with &, Marc-André Lureau, 2020/01/10
- [PATCH 13/26] object: rename link "child" to "target", Marc-André Lureau, 2020/01/10
- [PATCH 14/26] object: add direct link flag, Marc-André Lureau, 2020/01/10
- [PATCH 15/26] object: express const link with link property, Marc-André Lureau, 2020/01/10
- [PATCH 16/26] object: add object_class_property_add_link(), Marc-André Lureau, 2020/01/10
- [PATCH 17/26] object: release all props, Marc-André Lureau, 2020/01/10
- [PATCH 18/26] object: return self in object_ref(), Marc-André Lureau, 2020/01/10