diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-02-12 23:04:50 -0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-05-23 19:47:37 -0300 |
| commit | 42ecabaae16c0054dde6d8b0fdf90a8c7cce270d (patch) | |
| tree | d33885a9858825b59341944e70cbc025e40fd47e | |
| parent | 57f2453ab48a771b30aeced01b329ee85853bb7b (diff) | |
| download | qemu-42ecabaae16c0054dde6d8b0fdf90a8c7cce270d.zip qemu-42ecabaae16c0054dde6d8b0fdf90a8c7cce270d.tar.gz qemu-42ecabaae16c0054dde6d8b0fdf90a8c7cce270d.tar.bz2 | |
target-i386: Call cpu_exec_init() on realize
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.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target-i386/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9ac2e59..895a386 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2902,6 +2902,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } + cpu_exec_init(cs, &error_abort); + if (tcg_enabled()) { tcg_x86_init(); } @@ -3094,7 +3096,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, |