diff options
| -rw-r--r-- | include/qemu/object.h | 2 | ||||
| -rw-r--r-- | qom/object.c | 59 |
2 files changed, 31 insertions, 30 deletions
diff --git a/include/qemu/object.h b/include/qemu/object.h index 3c29c17bc0..ff5444f487 100644 --- a/include/qemu/object.h +++ b/include/qemu/object.h @@ -33,7 +33,7 @@ typedef struct TypeInfo TypeInfo; typedef struct InterfaceClass InterfaceClass; typedef struct InterfaceInfo InterfaceInfo; -#define TYPE_OBJECT NULL +#define TYPE_OBJECT "object" /** * SECTION:object.h diff --git a/qom/object.c b/qom/object.c index 36379a1397..dac9de57c2 100644 --- a/qom/object.c +++ b/qom/object.c @@ -210,7 +210,7 @@ static void type_class_interface_init(TypeImpl *ti, InterfaceImpl *iface) static void type_initialize(TypeImpl *ti) { - size_t class_size = sizeof(ObjectClass); + TypeImpl *parent; int i; if (ti->class) { @@ -221,30 +221,24 @@ static void type_initialize(TypeImpl *ti) ti->instance_size = type_object_get_size(ti); ti->class = g_malloc0(ti->class_size); - ti->class->type = ti; - - if (type_has_parent(ti)) { - TypeImpl *parent = type_get_parent(ti); + parent = type_get_parent(ti); + if (parent) { type_initialize(parent); - class_size = parent->class_size; g_assert(parent->class_size <= ti->class_size); + memcpy(ti->class, parent->class, parent->class_size); + } - memcpy((void *)ti->class + sizeof(ObjectClass), - (void *)parent->class + sizeof(ObjectClass), - parent->class_size - sizeof(ObjectClass)); + ti->class->type = ti; - while (parent) { - if (parent->class_base_init) { - parent->class_base_init(ti->class, ti->class_data); - } - parent = type_get_parent(parent); + while (parent) { + if (parent->class_base_init) { + parent->class_base_init(ti->class, ti->class_data); } + parent = type_get_parent(parent); } - memset((void *)ti->class + class_size, 0, ti->class_size - class_size); - for (i = 0; i < ti->num_interfaces; i++) { type_class_interface_init(ti, &ti->interfaces[i]); } @@ -477,19 +471,6 @@ Object *object_dynamic_cast(Object *obj, const char *typename) } -static void register_types(void) -{ - static TypeInfo interface_info = { - .name = TYPE_INTERFACE, - .instance_size = sizeof(Interface), - .abstract = true, - }; - - type_interface = type_register_static(&interface_info); -} - -type_init(register_types) - Object *object_dynamic_cast_assert(Object *obj, const char *typename) { Object *inst; @@ -1243,3 +1224,23 @@ void object_property_add_str(Object *obj, const char *name, property_release_str, prop, errp); } + +static void register_types(void) +{ + static TypeInfo interface_info = { + .name = TYPE_INTERFACE, + .instance_size = sizeof(Interface), + .abstract = true, + }; + + static TypeInfo object_info = { + .name = TYPE_OBJECT, + .instance_size = sizeof(Object), + .abstract = true, + }; + + type_interface = type_register_static(&interface_info); + type_register_static(&object_info); +} + +type_init(register_types) |