ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qom: eliminate identical functions 

Most property release functions in qom/object.c only free the opaque
value.  Combine all of them into a single function.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-27 12:12:57 -04:00
parent a6195b5b36
commit 169cbac12d
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qom/object.c
View File

@ -2174,11 +2174,10 @@ static void property_set_str(Object *obj, Visitor *v, const char *name,
g_free(value); g_free(value);
} }
static void property_release_str(Object *obj, const char *name, static void property_release_data(Object *obj, const char *name,
void *opaque) void *opaque)
{ {
StringProperty *prop = opaque; g_free(opaque);
g_free(prop);
} }
ObjectProperty * ObjectProperty *
@ -2194,7 +2193,7 @@ object_property_add_str(Object *obj, const char *name,
return object_property_add(obj, name, "string", return object_property_add(obj, name, "string",
get ? property_get_str : NULL, get ? property_get_str : NULL,
set ? property_set_str : NULL, set ? property_set_str : NULL,
property_release_str, property_release_data,
prop); prop);
} }
@ -2251,13 +2250,6 @@ static void property_set_bool(Object *obj, Visitor *v, const char *name,
prop->set(obj, value, errp); prop->set(obj, value, errp);
} }
static void property_release_bool(Object *obj, const char *name,
void *opaque)
{
BoolProperty *prop = opaque;
g_free(prop);
}
ObjectProperty * ObjectProperty *
object_property_add_bool(Object *obj, const char *name, object_property_add_bool(Object *obj, const char *name,
bool (*get)(Object *, Error **), bool (*get)(Object *, Error **),
@ -2271,7 +2263,7 @@ object_property_add_bool(Object *obj, const char *name,
return object_property_add(obj, name, "bool", return object_property_add(obj, name, "bool",
get ? property_get_bool : NULL, get ? property_get_bool : NULL,
set ? property_set_bool : NULL, set ? property_set_bool : NULL,
property_release_bool, property_release_data,
prop); prop);
} }
@ -2320,13 +2312,6 @@ static void property_set_enum(Object *obj, Visitor *v, const char *name,
prop->set(obj, value, errp); prop->set(obj, value, errp);
} }
static void property_release_enum(Object *obj, const char *name,
void *opaque)
{
EnumProperty *prop = opaque;
g_free(prop);
}
ObjectProperty * ObjectProperty *
object_property_add_enum(Object *obj, const char *name, object_property_add_enum(Object *obj, const char *name,
const char *typename, const char *typename,
@ -2343,7 +2328,7 @@ object_property_add_enum(Object *obj, const char *name,
return object_property_add(obj, name, typename, return object_property_add(obj, name, typename,
get ? property_get_enum : NULL, get ? property_get_enum : NULL,
set ? property_set_enum : NULL, set ? property_set_enum : NULL,
property_release_enum, property_release_data,
prop); prop);
} }
@ -2410,13 +2395,6 @@ out_end:
visit_end_struct(v, NULL); visit_end_struct(v, NULL);
} }
static void property_release_tm(Object *obj, const char *name,
void *opaque)
{
TMProperty *prop = opaque;
g_free(prop);
}
ObjectProperty * ObjectProperty *
object_property_add_tm(Object *obj, const char *name, object_property_add_tm(Object *obj, const char *name,
void (*get)(Object *, struct tm *, Error **)) void (*get)(Object *, struct tm *, Error **))
@ -2427,7 +2405,7 @@ object_property_add_tm(Object *obj, const char *name,
return object_property_add(obj, name, "struct tm", return object_property_add(obj, name, "struct tm",
get ? property_get_tm : NULL, NULL, get ? property_get_tm : NULL, NULL,
property_release_tm, property_release_data,
prop); prop);
} }