From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 4 Apr 2012 13:58:40 +0000 (+0200)
Subject: qom: Assert that public types have a non-NULL parent field
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~3991^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=049cb3cfdac182bbaab39a07936eb45fd1d83a4a;p=sdk%2Femulator%2Fqemu.git

qom: Assert that public types have a non-NULL parent field

This protects against unwanted effects of changing TYPE_OBJECT from
NULL to a string.

Suggested-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/qom/object.c b/qom/object.c
index dac9de5..cec2d40 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -95,7 +95,7 @@ static TypeImpl *type_table_lookup(const char *name)
     return g_hash_table_lookup(type_table_get(), name);
 }
 
-TypeImpl *type_register(const TypeInfo *info)
+static TypeImpl *type_register_internal(const TypeInfo *info)
 {
     TypeImpl *ti = g_malloc0(sizeof(*ti));
 
@@ -137,6 +137,12 @@ TypeImpl *type_register(const TypeInfo *info)
     return ti;
 }
 
+TypeImpl *type_register(const TypeInfo *info)
+{
+    assert(info->parent);
+    return type_register_internal(info);
+}
+
 TypeImpl *type_register_static(const TypeInfo *info)
 {
     return type_register(info);
@@ -204,7 +210,7 @@ static void type_class_interface_init(TypeImpl *ti, InterfaceImpl *iface)
     char *name = g_strdup_printf("<%s::%s>", ti->name, iface->parent);
 
     info.name = name;
-    iface->type = type_register(&info);
+    iface->type = type_register_internal(&info);
     g_free(name);
 }
 
@@ -1239,8 +1245,8 @@ static void register_types(void)
         .abstract = true,
     };
 
-    type_interface = type_register_static(&interface_info);
-    type_register_static(&object_info);
+    type_interface = type_register_internal(&interface_info);
+    type_register_internal(&object_info);
 }
 
 type_init(register_types)