mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Factor out pc_new_cpu

Browse Source 
At this point, this refactoring looks like overkill. But we will need it
for CPU hotplugging, and qemu-kvm already carries it. Merging it early
would help qemu-kvm when rebasing against upstream.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-06-25 08:23:39 +02:00 committed by Anthony Liguori
parent 15dfcd454c
commit 3a31f36a07
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/pc.c
View File

@ -1062,6 +1062,25 @@ int cpu_is_bsp(CPUState *env)
return env->cpuid_apic_id == 0;
}
static CPUState *pc_new_cpu(const char *cpu_model)
{
CPUState *env;
env = cpu_init(cpu_model);
if (!env) {
fprintf(stderr, "Unable to find x86 CPU definition\n");
exit(1);
}
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
env->cpuid_apic_id = env->cpu_index;
/* APIC reset callback resets cpu */
apic_init(env);
} else {
qemu_register_reset((QEMUResetHandler*)cpu_reset, env);
}
return env;
}
/* PC hardware initialisation */
static void pc_init1(ram_addr_t ram_size,
const char *boot_device,
@ -1103,20 +1122,9 @@ static void pc_init1(ram_addr_t ram_size,
cpu_model = "qemu32";
#endif
}
for(i = 0; i < smp_cpus; i++) {
env = cpu_init(cpu_model);
if (!env) {
fprintf(stderr, "Unable to find x86 CPU definition\n");
exit(1);
}
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
env->cpuid_apic_id = env->cpu_index;
/* APIC reset callback resets cpu */
apic_init(env);
} else {
qemu_register_reset((QEMUResetHandler*)cpu_reset, env);
}
for (i = 0; i < smp_cpus; i++) {
env = pc_new_cpu(cpu_model);
}
vmport_init();