From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCsMt-00058E-0Z for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:52:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCsMq-0007pN-EP for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:52:50 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 28 Mar 2012 14:52:16 +0200 Message-Id: <1332939159-16434-14-git-send-email-afaerber@suse.de> In-Reply-To: <1332939159-16434-1-git-send-email-afaerber@suse.de> References: <1332939159-16434-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH stable-0.15 13/36] Fix X86 CPU topology in KVM mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , kvm@suse.de, qemu-stable@nongnu.org, Bruce Rogers , Bharata B Rao , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Bharata B Rao apic id returned to guest kernel in ebx for cpuid(function=3D1) depends o= n CPUX86State->cpuid_apic_id which gets populated after the cpuid informati= on is cached in the host kernel. This results in broken CPU topology in gues= t. 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 Signed-off-by: Bharata B Rao Signed-off-by: Anthony Liguori (cherry picked from commit f2209eb854a016eabc444b45f6d6b1636949141f) Signed-off-by: Bruce Rogers Signed-off-by: Andreas F=C3=A4rber --- hw/pc.c | 1 - target-i386/helper.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) 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 =3D env->cpu_index; env->apic_state =3D 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 =3D env->cpu_index; mce_init(env); =20 qemu_init_vcpu(env); --=20 1.7.7