| Message ID | 1462558292-2126-4-git-send-email-ehabkost@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 6 May 2016 15:11:26 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > QOM instance_init functions are not supposed to have any side-effects, > as new objects may be created at any moment for querying property > information (see qmp_device_list_properties()). > > Calling cpu_exec_init() also affects QEMU's ability to handle errors > during CPU creation, as some actions done by cpu_exec_init() can't be > reverted. > > Move cpu_exec_init() call to realize so a simple object_new() won't > trigger it, and so that it is called after some basic validation of CPU > parameters. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > Changes v1 -> v2: > * Call cpu_exec_init() after basic parameter validation > --- > target-i386/cpu.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index bde649a..26a5a6b 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -2901,6 +2901,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > } > > > + cpu_exec_init(cs, &error_abort); > + > if (tcg_enabled()) { > tcg_x86_init(); > } > @@ -3093,7 +3095,6 @@ static void x86_cpu_initfn(Object *obj) > FeatureWord w; > > cs->env_ptr = env; > - cpu_exec_init(cs, &error_abort); > > object_property_add(obj, "family", "int", > x86_cpuid_version_get_family,
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bde649a..26a5a6b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2901,6 +2901,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } + cpu_exec_init(cs, &error_abort); + if (tcg_enabled()) { tcg_x86_init(); } @@ -3093,7 +3095,6 @@ static void x86_cpu_initfn(Object *obj) FeatureWord w; cs->env_ptr = env; - cpu_exec_init(cs, &error_abort); object_property_add(obj, "family", "int", x86_cpuid_version_get_family,
QOM instance_init functions are not supposed to have any side-effects, as new objects may be created at any moment for querying property information (see qmp_device_list_properties()). Calling cpu_exec_init() also affects QEMU's ability to handle errors during CPU creation, as some actions done by cpu_exec_init() can't be reverted. Move cpu_exec_init() call to realize so a simple object_new() won't trigger it, and so that it is called after some basic validation of CPU parameters. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes v1 -> v2: * Call cpu_exec_init() after basic parameter validation --- target-i386/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)