From 65dee38052597b6285eb208125369f01b29ba6c1 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Mon, 23 Jul 2012 15:22:28 +0200 Subject: target-i386: move cpu_reset and reset callback to cpu.c 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 externaly. When reset over QOM hierarchy is implemented, reset callback should be removed. v2: - leave cpu_reset in pc_new_cpu() for now, it's to be cleaned up when APIC init is moved in cpu.c Signed-off-by: Igor Mammedov Signed-off-by: Anthony Liguori --- hw/pc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index a920686..bd193f3 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -904,12 +904,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; @@ -924,8 +918,7 @@ 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); - pc_cpu_reset(cpu); + cpu_reset(CPU(cpu)); return cpu; } -- cgit v1.1