Message ID | 1332939159-16434-14-git-send-email-afaerber@suse.de |
---|---|
State | New |
Headers | show |
diff --git a/hw/pc.c b/hw/pc.c index a3e8539..14ce684 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -931,7 +931,6 @@ static CPUState *pc_new_cpu(const char *cpu_model) exit(1); } if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { - env->cpuid_apic_id = env->cpu_index; env->apic_state = apic_init(env, env->cpuid_apic_id); } qemu_register_reset(pc_cpu_reset, env); diff --git a/target-i386/helper.c b/target-i386/helper.c index e9be104..829c1da 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1258,6 +1258,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) cpu_x86_close(env); return NULL; } + env->cpuid_apic_id = env->cpu_index; mce_init(env); qemu_init_vcpu(env);