Skip to content

Commit

Permalink
object: rename link "child" to "target"
Browse files Browse the repository at this point in the history
A child property is a different kind of property. Let's use "target"
for the link target.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200110153039.1379601-14-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
elmarco authored and bonzini committed Jan 24, 2020
1 parent 8770baf commit 3685420
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions include/qom/object.h
Expand Up @@ -1528,7 +1528,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
Expand All @@ -1553,7 +1553,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,
Expand Down
24 changes: 12 additions & 12 deletions qom/object.c
Expand Up @@ -1713,7 +1713,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;
Expand All @@ -1723,11 +1723,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 {
Expand Down Expand Up @@ -1782,8 +1782,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;

Expand All @@ -1805,7 +1805,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);
Expand All @@ -1816,22 +1816,22 @@ 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,
void *opaque)
{
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,
Expand All @@ -1842,7 +1842,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;

Expand Down

0 comments on commit 3685420

Please sign in to comment.