diff options
| author | Bharata B Rao <bharata.rao@gmail.com> | 2011-11-02 14:16:08 +0530 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-02 07:55:05 -0500 |
| commit | f2209eb854a016eabc444b45f6d6b1636949141f (patch) | |
| tree | 612bd9e8888ee4a69f480e6007397c651c0ce850 | |
| parent | 18ebcc86f2e21c83efe26b09218c859234876465 (diff) | |
| download | focaccia-qemu-f2209eb854a016eabc444b45f6d6b1636949141f.tar.gz focaccia-qemu-f2209eb854a016eabc444b45f6d6b1636949141f.zip | |
Fix X86 CPU topology in KVM mode
apic id returned to guest kernel in ebx for cpuid(function=1) depends on CPUX86State->cpuid_apic_id which gets populated after the cpuid information is cached in the host kernel. This results in broken CPU topology in guest. Fix this by setting cpuid_apic_id before cpuid information is passed to the host kernel. This is done by moving the setting of cpuid_apic_id to cpu_x86_init() where it will work for both KVM as well as TCG modes. Acked-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Bharata B Rao <bharata.rao@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/pc.c | 1 | ||||
| -rw-r--r-- | target-i386/helper.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/hw/pc.c b/hw/pc.c index eb4c2d8770..25bfa85022 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -941,7 +941,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 6c6a1675df..2586aff700 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1257,6 +1257,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); |