motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-30 13:31:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qom: reverse order of instance_post_init calls

Browse source 
Currently, the instance_post_init calls are performed from the leaf
class and all the way up to Object.  This is incorrect because the
leaf class cannot observe property values applied by the superclasses;
for example, a compat property will be set on a device *after*
the class's post_init callback has run.

In particular this makes it impossible for implementations of
accel_cpu_instance_init() to operate based on the actual values of
the properties, though it seems that cxl_dsp_instance_post_init and
rp_instance_post_init might have similar issues.

Follow instead the same order as instance_init, starting with Object
and running the child class's instance_post_init after the parent.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-02-03 12:35:39 +01:00
parent 42bc8af140
commit 220c739903
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/qom/object.h
View file

@ -445,7 +445,8 @@ struct Object
* class will have already been initialized so the type is only responsible * class will have already been initialized so the type is only responsible
* for initializing its own members. * for initializing its own members.
* @instance_post_init: This function is called to finish initialization of * @instance_post_init: This function is called to finish initialization of
* an object, after all @instance_init functions were called. * an object, after all @instance_init functions were called, as well as
* @instance_post_init functions for the parent classes.
* @instance_finalize: This function is called during object destruction. This * @instance_finalize: This function is called during object destruction. This
* is called before the parent @instance_finalize function has been called. * is called before the parent @instance_finalize function has been called.
* An object should only free the members that are unique to its type in this * An object should only free the members that are unique to its type in this

8
qom/object.c
View file

@ -431,13 +431,13 @@ static void object_init_with_type(Object *obj, TypeImpl *ti)
static void object_post_init_with_type(Object *obj, TypeImpl *ti) static void object_post_init_with_type(Object *obj, TypeImpl *ti)
{ {
if (ti->instance_post_init) {
ti->instance_post_init(obj);
}
if (type_has_parent(ti)) { if (type_has_parent(ti)) {
object_post_init_with_type(obj, type_get_parent(ti)); object_post_init_with_type(obj, type_get_parent(ti));
} }
if (ti->instance_post_init) {
ti->instance_post_init(obj);
}
} }
bool object_apply_global_props(Object *obj, const GPtrArray *props, bool object_apply_global_props(Object *obj, const GPtrArray *props,