summaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-03-19 08:58:56 +0100
committerAndreas Färber <afaerber@suse.de>2014-03-19 22:23:13 +0100
commit39f72ef94ba74701d18daf82b44c18a60f94eb60 (patch)
treea79b0e1004d295dc4e988f484b7dac5a76d2cef8 /qom
parent9561fda8d90e176bef598ba87c42a1bd6ad03ef7 (diff)
downloadqemu-39f72ef94ba74701d18daf82b44c18a60f94eb60.tar.gz
qemu-39f72ef94ba74701d18daf82b44c18a60f94eb60.tar.bz2
qemu-39f72ef94ba74701d18daf82b44c18a60f94eb60.zip
qom: Add check() argument to object_property_add_link()
There are currently three types of object_property_add_link() callers: 1. The link property may be set at any time. 2. The link property of a DeviceState instance may only be set before realize. 3. The link property may never be set, it is read-only. Something similar can already be achieved with object_property_add_str()'s set() argument. Follow its example and add a check() argument to object_property_add_link(). Also provide default check() functions for case #1 and #2. Case #3 is covered by passing a NULL function pointer. Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com> Cc: Alexander Graf <agraf@suse.de> Cc: Anthony Liguori <aliguori@amazon.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> [AF: Tweaked documentation comment] Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/qom/object.c b/qom/object.c
index 9e22f11e21..f4de619b7b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1023,8 +1023,15 @@ out:
g_free(type);
}
+void object_property_allow_set_link(Object *obj, const char *name,
+ Object *val, Error **errp)
+{
+ /* Allow the link to be set, always */
+}
+
typedef struct {
Object **child;
+ void (*check)(Object *, const char *, Object *, Error **);
ObjectPropertyLinkFlags flags;
} LinkProperty;
@@ -1105,6 +1112,12 @@ static void object_set_link_property(Object *obj, Visitor *v, void *opaque,
return;
}
+ prop->check(obj, name, new_target, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
if (new_target) {
object_ref(new_target);
}
@@ -1127,6 +1140,8 @@ static void object_release_link_property(Object *obj, const char *name,
void object_property_add_link(Object *obj, const char *name,
const char *type, Object **child,
+ void (*check)(Object *, const char *,
+ Object *, Error **),
ObjectPropertyLinkFlags flags,
Error **errp)
{
@@ -1135,13 +1150,14 @@ void object_property_add_link(Object *obj, const char *name,
gchar *full_type;
prop->child = child;
+ prop->check = check;
prop->flags = flags;
full_type = g_strdup_printf("link<%s>", type);
object_property_add(obj, name, full_type,
object_get_link_property,
- object_set_link_property,
+ check ? object_set_link_property : NULL,
object_release_link_property,
prop,
&local_err);