aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2020-01-10 19:30:29 +0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-01-24 20:59:14 +0100
commit840ecdfbf9b401e018c43c45a909c7bbf37224e9 (patch)
treead3a9780d79c697bdb97797fbc466d12590ba138
parent4a8d57989b9de26d608684ed349adf02436a0a94 (diff)
object: add object_class_property_add_link()
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20200110153039.1379601-17-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--include/qom/object.h9
-rw-r--r--qom/object.c46
2 files changed, 54 insertions, 1 deletions
diff --git a/include/qom/object.h b/include/qom/object.h
index 24d6ebe675..5e2f60d4b0 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1514,6 +1514,7 @@ typedef enum {
/* private */
OBJ_PROP_LINK_DIRECT = 0x2,
+ OBJ_PROP_LINK_CLASS = 0x4,
} ObjectPropertyLinkFlags;
/**
@@ -1562,6 +1563,14 @@ void object_property_add_link(Object *obj, const char *name,
ObjectPropertyLinkFlags flags,
Error **errp);
+ObjectProperty *object_class_property_add_link(ObjectClass *oc,
+ const char *name,
+ const char *type, ptrdiff_t offset,
+ void (*check)(const Object *obj, const char *name,
+ Object *val, Error **errp),
+ ObjectPropertyLinkFlags flags,
+ Error **errp);
+
/**
* object_property_add_str:
* @obj: the object to add a property to
diff --git a/qom/object.c b/qom/object.c
index b2bc87b0dc..a3da546366 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1716,6 +1716,7 @@ typedef struct {
union {
Object **targetp;
Object *target; /* if OBJ_PROP_LINK_DIRECT, when holding the pointer */
+ ptrdiff_t offset; /* if OBJ_PROP_LINK_CLASS */
};
void (*check)(const Object *, const char *, Object *, Error **);
ObjectPropertyLinkFlags flags;
@@ -1726,6 +1727,8 @@ object_link_get_targetp(Object *obj, LinkProperty *lprop)
{
if (lprop->flags & OBJ_PROP_LINK_DIRECT) {
return &lprop->target;
+ } else if (lprop->flags & OBJ_PROP_LINK_CLASS) {
+ return (void *)obj + lprop->offset;
} else {
return lprop->targetp;
}
@@ -1841,7 +1844,9 @@ static void object_release_link_property(Object *obj, const char *name,
if ((prop->flags & OBJ_PROP_LINK_STRONG) && *targetp) {
object_unref(*targetp);
}
- g_free(prop);
+ if (!(prop->flags & OBJ_PROP_LINK_CLASS)) {
+ g_free(prop);
+ }
}
static void object_add_link_prop(Object *obj, const char *name,
@@ -1894,6 +1899,45 @@ void object_property_add_link(Object *obj, const char *name,
object_add_link_prop(obj, name, type, targetp, check, flags, errp);
}
+ObjectProperty *
+object_class_property_add_link(ObjectClass *oc,
+ const char *name,
+ const char *type, ptrdiff_t offset,
+ void (*check)(const Object *obj, const char *name,
+ Object *val, Error **errp),
+ ObjectPropertyLinkFlags flags,
+ Error **errp)
+{
+ Error *local_err = NULL;
+ LinkProperty *prop = g_new0(LinkProperty, 1);
+ gchar *full_type;
+ ObjectProperty *op;
+
+ prop->offset = offset;
+ prop->check = check;
+ prop->flags = flags | OBJ_PROP_LINK_CLASS;
+
+ full_type = g_strdup_printf("link<%s>", type);
+
+ op = object_class_property_add(oc, name, full_type,
+ object_get_link_property,
+ check ? object_set_link_property : NULL,
+ object_release_link_property,
+ prop,
+ &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ g_free(prop);
+ goto out;
+ }
+
+ op->resolve = object_resolve_link_property;
+
+out:
+ g_free(full_type);
+ return op;
+}
+
void object_property_add_const_link(Object *obj, const char *name,
Object *target, Error **errp)
{