[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/26] object: rename link "child" to "target"
From: |
Marc-André Lureau |
Subject: |
[PATCH 13/26] object: rename link "child" to "target" |
Date: |
Fri, 10 Jan 2020 19:30:26 +0400 |
A child property is a different kind of property. Let's use "target"
for the link target.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/qom/object.h | 4 ++--
qom/object.c | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index fb133d693f..7e66bc78c9 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1545,7 +1545,7 @@ void object_property_allow_set_link(const Object *, const
char *,
* @obj: the object to add a property to
* @name: the name of the property
* @type: the qobj type of the link
- * @child: a pointer to where the link object reference is stored
+ * @targetp: a pointer to where the link object reference is stored
* @check: callback to veto setting or NULL if the property is read-only
* @flags: additional options for the link
* @errp: if an error occurs, a pointer to an area to store the error
@@ -1570,7 +1570,7 @@ void object_property_allow_set_link(const Object *, const
char *,
* modified.
*/
void object_property_add_link(Object *obj, const char *name,
- const char *type, Object **child,
+ const char *type, Object **targetp,
void (*check)(const Object *obj, const char
*name,
Object *val, Error **errp),
ObjectPropertyLinkFlags flags,
diff --git a/qom/object.c b/qom/object.c
index 9df4c14226..47d8be81a6 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1720,7 +1720,7 @@ void object_property_allow_set_link(const Object *obj,
const char *name,
}
typedef struct {
- Object **child;
+ Object **targetp;
void (*check)(const Object *, const char *, Object *, Error **);
ObjectPropertyLinkFlags flags;
} LinkProperty;
@@ -1730,11 +1730,11 @@ static void object_get_link_property(Object *obj,
Visitor *v,
Error **errp)
{
LinkProperty *lprop = opaque;
- Object **child = lprop->child;
+ Object **targetp = lprop->targetp;
gchar *path;
- if (*child) {
- path = object_get_canonical_path(*child);
+ if (*targetp) {
+ path = object_get_canonical_path(*targetp);
visit_type_str(v, name, &path, errp);
g_free(path);
} else {
@@ -1789,8 +1789,8 @@ static void object_set_link_property(Object *obj, Visitor
*v,
{
Error *local_err = NULL;
LinkProperty *prop = opaque;
- Object **child = prop->child;
- Object *old_target = *child;
+ Object **targetp = prop->targetp;
+ Object *old_target = *targetp;
Object *new_target = NULL;
char *path = NULL;
@@ -1812,7 +1812,7 @@ static void object_set_link_property(Object *obj, Visitor
*v,
return;
}
- *child = new_target;
+ *targetp = new_target;
if (prop->flags & OBJ_PROP_LINK_STRONG) {
object_ref(new_target);
object_unref(old_target);
@@ -1823,7 +1823,7 @@ static Object *object_resolve_link_property(Object
*parent, void *opaque, const
{
LinkProperty *lprop = opaque;
- return *lprop->child;
+ return *lprop->targetp;
}
static void object_release_link_property(Object *obj, const char *name,
@@ -1831,14 +1831,14 @@ static void object_release_link_property(Object *obj,
const char *name,
{
LinkProperty *prop = opaque;
- if ((prop->flags & OBJ_PROP_LINK_STRONG) && *prop->child) {
- object_unref(*prop->child);
+ if ((prop->flags & OBJ_PROP_LINK_STRONG) && *prop->targetp) {
+ object_unref(*prop->targetp);
}
g_free(prop);
}
void object_property_add_link(Object *obj, const char *name,
- const char *type, Object **child,
+ const char *type, Object **targetp,
void (*check)(const Object *, const char *,
Object *, Error **),
ObjectPropertyLinkFlags flags,
@@ -1849,7 +1849,7 @@ void object_property_add_link(Object *obj, const char
*name,
gchar *full_type;
ObjectProperty *op;
- prop->child = child;
+ prop->targetp = targetp;
prop->check = check;
prop->flags = flags;
--
2.25.0.rc1.20.g2443f3f80d.dirty
- [PATCH 06/26] object: add class property initializer, (continued)
- [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
- Re: [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}(), Paolo Bonzini, 2020/01/23
- Re: [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}(), Marc-André Lureau, 2020/01/23
- Re: [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}(), Paolo Bonzini, 2020/01/23
- [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 <=
- [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
- [PATCH 20/26] qdev: move instance properties to class properties, Marc-André Lureau, 2020/01/10
- [PATCH 21/26] qdev: register properties as class properties, Marc-André Lureau, 2020/01/10
- [PATCH 19/26] qdev: set properties with device_class_set_props(), Marc-André Lureau, 2020/01/10