OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

object: rename link "child" to "target"

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2020-01-10 19:30:26 +04:00 committed by Paolo Bonzini
parent 8770bafdc9
commit 36854207f0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qom/object.h
View File

@ -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,

24
qom/object.c
View File

@ -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;