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

qom: Introduce object_property_is_{child,link}() 

Avoids hardcoding partial string comparisons.

Signed-off-by: Alexander Barabash <alexander_barabash@mentor.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Andreas Färber 2012-05-27 00:32:40 +02:00
parent e7cce67f27
commit 5d9d3f4757
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qom/object.c
View File

@ -296,6 +296,16 @@ void object_initialize(void *data, const char *typename)
object_initialize_with_type(data, type); object_initialize_with_type(data, type);
} }
static inline bool object_property_is_child(ObjectProperty *prop)
{
return strstart(prop->type, "child<", NULL);
}
static inline bool object_property_is_link(ObjectProperty *prop)
{
return strstart(prop->type, "link<", NULL);
}
static void object_property_del_all(Object *obj) static void object_property_del_all(Object *obj)
{ {
while (!QTAILQ_EMPTY(&obj->properties)) { while (!QTAILQ_EMPTY(&obj->properties)) {
@ -318,7 +328,7 @@ static void object_property_del_child(Object *obj, Object *child, Error **errp)
ObjectProperty *prop; ObjectProperty *prop;
QTAILQ_FOREACH(prop, &obj->properties, node) { QTAILQ_FOREACH(prop, &obj->properties, node) {
if (strstart(prop->type, "child<", NULL) && prop->opaque == child) { if (object_property_is_child(prop) && prop->opaque == child) {
object_property_del(obj, prop->name, errp); object_property_del(obj, prop->name, errp);
break; break;
} }
@ -1008,7 +1018,7 @@ gchar *object_get_canonical_path(Object *obj)
g_assert(obj->parent != NULL); g_assert(obj->parent != NULL);
QTAILQ_FOREACH(prop, &obj->parent->properties, node) { QTAILQ_FOREACH(prop, &obj->parent->properties, node) {
if (!strstart(prop->type, "child<", NULL)) { if (!object_property_is_child(prop)) {
continue; continue;
} }
@ -1042,9 +1052,9 @@ Object *object_resolve_path_component(Object *parent, gchar *part)
return NULL; return NULL;
} }
if (strstart(prop->type, "link<", NULL)) { if (object_property_is_link(prop)) {
return *(Object **)prop->opaque; return *(Object **)prop->opaque;
} else if (strstart(prop->type, "child<", NULL)) { } else if (object_property_is_child(prop)) {
return prop->opaque; return prop->opaque;
} else { } else {
return NULL; return NULL;
@ -1087,7 +1097,7 @@ static Object *object_resolve_partial_path(Object *parent,
QTAILQ_FOREACH(prop, &parent->properties, node) { QTAILQ_FOREACH(prop, &parent->properties, node) {
Object *found; Object *found;
if (!strstart(prop->type, "child<", NULL)) { if (!object_property_is_child(prop)) {
continue; continue;
} }