@@ -229,4 +229,16 @@ void object_property_set_uint64_ptr(Object *obj, struct Visitor *v,
void *opaque, const char *name,
Error **errp);
+/**
+ * object_property_release_g_free:
+ * @obj: the object that owns the property
+ * @name: name of the property
+ * @opaque: pointer to glib allocated memory
+ *
+ * Generic helper function to free a property using g_free(). Use this if you
+ * want to make sure that your property is properly g_free()'d when the property
+ * gets released.
+ */
+void object_property_release_g_free(Object *obj, const char *name, void *opaque);
+
#endif /* !QEMU_PROPERTY_H */
@@ -1406,13 +1406,6 @@ static Object *property_resolve_alias(Object *obj, void *opaque,
return object_resolve_path_component(prop->target_obj, prop->target_name);
}
-static void property_release_alias(Object *obj, const char *name, void *opaque)
-{
- AliasProperty *prop = opaque;
-
- g_free(prop);
-}
-
void object_property_add_alias(Object *obj, const char *name,
Object *target_obj, const char *target_name,
Error **errp)
@@ -1441,7 +1434,7 @@ void object_property_add_alias(Object *obj, const char *name,
op = object_property_add(obj, name, prop_type,
property_get_alias,
property_set_alias,
- property_release_alias,
+ object_property_release_g_free,
prop, errp);
op->resolve = property_resolve_alias;
@@ -61,11 +61,9 @@ static void property_set_str(Object *obj, Visitor *v, void *opaque,
g_free(value);
}
-static void property_release_str(Object *obj, const char *name,
- void *opaque)
+void object_property_release_g_free(Object *obj, const char *name, void *opaque)
{
- StringProperty *prop = opaque;
- g_free(prop);
+ g_free(opaque);
}
void object_property_add_str(Object *obj, const char *name,
@@ -82,7 +80,7 @@ void object_property_add_str(Object *obj, const char *name,
object_property_add(obj, name, "string",
get ? property_get_str : NULL,
set ? property_set_str : NULL,
- property_release_str,
+ object_property_release_g_free,
prop, &local_err);
if (local_err) {
error_propagate(errp, local_err);
@@ -122,13 +120,6 @@ static void property_set_bool(Object *obj, Visitor *v, void *opaque,
prop->set(obj, value, errp);
}
-static void property_release_bool(Object *obj, const char *name,
- void *opaque)
-{
- BoolProperty *prop = opaque;
- g_free(prop);
-}
-
void object_property_add_bool(Object *obj, const char *name,
bool (*get)(Object *, Error **),
void (*set)(Object *, bool, Error **),
@@ -143,7 +134,7 @@ void object_property_add_bool(Object *obj, const char *name,
object_property_add(obj, name, "bool",
get ? property_get_bool : NULL,
set ? property_set_bool : NULL,
- property_release_bool,
+ object_property_release_g_free,
prop, &local_err);
if (local_err) {
error_propagate(errp, local_err);
A good amount of properties are really just g_new / g_malloc allocated memory. There's no reason we need to have different release helpers for all of those. This patch introduces a new g_free() based helper for property release and replaces existing duplicated code implementations in object.c as well as property.c with it. Signed-off-by: Alexander Graf <agraf@suse.de> --- include/qom/property.h | 12 ++++++++++++ qom/object.c | 9 +-------- qom/property.c | 17 ++++------------- 3 files changed, 17 insertions(+), 21 deletions(-)