Despite repeated protest commit 65dee38052597b6285eb208125369f01b29ba6c1
(target-i386: move cpu_reset and reset callback to cpu.c) moved
registration of a reset callback from hw/pc.c to target-i386/cpu.c
while all other CPU reset handlers were still registered from machines.
Instead, improve the situation by registering the callback in
qemu_init_vcpu(). Now new machines or CPUs no longer need to register
their own callbacks, and we can revert the code in target-i386/cpu.c.
Signed-off-by: Andreas Färber <afaer...@suse.de>
Cc: Anthony Liguori <anth...@codemonkey.ws>
Cc: Igor Mammedov <imamm...@redhat.com>
---
cpus.c | 8 ++++++++
target-i386/cpu.c | 11 -----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/cpus.c b/cpus.c
index 756e624..f717a61 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1020,6 +1020,13 @@ static void qemu_dummy_start_vcpu(CPUArchState *env)
}
}
+static void cpu_machine_reset(void *opaque)
+{
+ CPUState *cpu = opaque;
+
+ cpu_reset(cpu);
+}
+
void qemu_init_vcpu(void *_env)
{
CPUArchState *env = _env;
@@ -1027,6 +1034,7 @@ void qemu_init_vcpu(void *_env)
env->nr_cores = smp_cores;
env->nr_threads = smp_threads;
env->stopped = 1;
+ qemu_register_reset(cpu_machine_reset, ENV_GET_CPU(env));
if (kvm_enabled()) {
qemu_kvm_start_vcpu(env);
} else if (tcg_enabled()) {
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 857b94e..a511de9 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1704,13 +1704,6 @@ bool cpu_is_bsp(X86CPU *cpu)
{
return cpu_get_apic_base(cpu->env.apic_state) & MSR_IA32_APICBASE_BSP;
}
-
-/* TODO: remove me, when reset over QOM tree is implemented */
-static void x86_cpu_machine_reset_cb(void *opaque)
-{
- X86CPU *cpu = opaque;
- cpu_reset(CPU(cpu));
-}
#endif
static void mce_init(X86CPU *cpu)
@@ -1733,10 +1726,6 @@ void x86_cpu_realize(Object *obj, Error **errp)
{
X86CPU *cpu = X86_CPU(obj);
-#ifndef CONFIG_USER_ONLY
- qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
-#endif
-
mce_init(cpu);
qemu_init_vcpu(&cpu->env);
cpu_reset(CPU(cpu));
--
1.7.7
