[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] target-i386: move cpu_reset and reset callback
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 5/5] target-i386: move cpu_reset and reset callback to cpu.c |
Date: |
Wed, 20 Jun 2012 14:59:24 +0200 |
Moving reset callback into cpu object from board level and
resetting cpu at the end of x86_cpu_realize() will allow properly
create cpu object during run-time (hotplug) without calling reset exteraly.
When reset over QOM hierarchy is implemented, reset callback
should be removed.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/pc.c | 9 +--------
target-i386/cpu.c | 14 ++++++++++++++
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 2af066a..adb0730 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -918,12 +918,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int
level)
}
}
-static void pc_cpu_reset(void *opaque)
-{
- X86CPU *cpu = opaque;
- cpu_reset(CPU(cpu));
-}
-
static X86CPU *pc_new_cpu(const char *cpu_model)
{
X86CPU *cpu;
@@ -938,9 +932,8 @@ static X86CPU *pc_new_cpu(const char *cpu_model)
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
env->apic_state = apic_init(env, env->cpuid_apic_id);
}
- qemu_register_reset(pc_cpu_reset, cpu);
+
x86_cpu_realize(OBJECT(cpu), NULL);
- pc_cpu_reset(cpu);
return cpu;
}
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index d400f4b..b4102c3 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1689,6 +1689,15 @@ static void x86_cpu_reset(CPUState *s)
#endif
}
+#ifndef CONFIG_USER_ONLY
+/* 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)
{
CPUX86State *cenv = &cpu->env;
@@ -1709,8 +1718,13 @@ 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));
}
static void x86_cpu_initfn(Object *obj)
--
1.7.10.2