ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <imammedo@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Igor Mammedov 2012-07-23 15:22:28 +02:00 committed by Anthony Liguori
parent dd673288a8
commit 65dee38052
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/pc.c
View File

@ -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) static X86CPU *pc_new_cpu(const char *cpu_model)
{ {
X86CPU *cpu; X86CPU *cpu;
@ -924,8 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model)
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
env->apic_state = apic_init(env, env->cpuid_apic_id); env->apic_state = apic_init(env, env->cpuid_apic_id);
} }
qemu_register_reset(pc_cpu_reset, cpu); cpu_reset(CPU(cpu));
pc_cpu_reset(cpu);
return cpu; return cpu;
} }

14
target-i386/cpu.c
View File

@ -31,6 +31,8 @@
#include "hyperv.h" #include "hyperv.h"
#include "hw/hw.h"
/* feature flags taken from "Intel Processor Identification and the CPUID /* feature flags taken from "Intel Processor Identification and the CPUID
* Instruction" and AMD's "CPUID Specification". In cases of disagreement * Instruction" and AMD's "CPUID Specification". In cases of disagreement
* between feature naming conventions, aliases may be added. * between feature naming conventions, aliases may be added.
@ -1702,6 +1704,13 @@ bool cpu_is_bsp(X86CPU *cpu)
{ {
return cpu_get_apic_base(cpu->env.apic_state) & MSR_IA32_APICBASE_BSP; 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 #endif
static void mce_init(X86CPU *cpu) static void mce_init(X86CPU *cpu)
@ -1724,8 +1733,13 @@ void x86_cpu_realize(Object *obj, Error **errp)
{ {
X86CPU *cpu = X86_CPU(obj); X86CPU *cpu = X86_CPU(obj);
#ifndef CONFIG_USER_ONLY
qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
#endif
mce_init(cpu); mce_init(cpu);
qemu_init_vcpu(&cpu->env); qemu_init_vcpu(&cpu->env);
cpu_reset(CPU(cpu));
} }
static void x86_cpu_initfn(Object *obj) static void x86_cpu_initfn(Object *obj)