diff options
| -rw-r--r-- | include/qom/object.h | 4 | ||||
| -rw-r--r-- | qom/object.c | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/qom/object.h b/include/qom/object.h index 82cf20f441..a163adc7c5 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -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 @@ -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, diff --git a/qom/object.c b/qom/object.c index d7974e9844..bb5b739c61 100644 --- a/qom/object.c +++ b/qom/object.c @@ -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; @@ -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 { @@ -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; @@ -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); @@ -1816,7 +1816,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, @@ -1824,14 +1824,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, @@ -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; |