From 39f72ef94ba74701d18daf82b44c18a60f94eb60 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Wed, 19 Mar 2014 08:58:56 +0100 Subject: qom: Add check() argument to object_property_add_link() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Alexander Graf Cc: Anthony Liguori Cc: "Michael S. Tsirkin" Signed-off-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini [AF: Tweaked documentation comment] Signed-off-by: Andreas Färber --- qom/object.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'qom') diff --git a/qom/object.c b/qom/object.c index 9e22f11..f4de619 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); -- cgit v1.1