From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LuvAc-0005mH-FW for qemu-devel@nongnu.org; Fri, 17 Apr 2009 17:00:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LuvAX-0005iY-ES for qemu-devel@nongnu.org; Fri, 17 Apr 2009 17:00:21 -0400 Received: from [199.232.76.173] (port=58333 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LuvAX-0005iU-8T for qemu-devel@nongnu.org; Fri, 17 Apr 2009 17:00:17 -0400 Received: from mx2.redhat.com ([66.187.237.31]:52347) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LuvAV-0000IQ-6S for qemu-devel@nongnu.org; Fri, 17 Apr 2009 17:00:17 -0400 From: Glauber Costa Date: Fri, 17 Apr 2009 17:00:05 -0400 Message-Id: <1240002008-2351-3-git-send-email-glommer@redhat.com> In-Reply-To: <1240002008-2351-2-git-send-email-glommer@redhat.com> References: <1240002008-2351-1-git-send-email-glommer@redhat.com> <1240002008-2351-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/5] always have apic Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com if we are going to initialize the apic, set cpuid bit unconditionally. As far as I know, we should not do that for isa machines anyway. Signed-off-by: Glauber Costa --- hw/pc.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 39ed066..7649f2c 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -784,12 +784,10 @@ CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled) } if (cpu != 0) env->halted = 1; - if (smp_cpus > 1) { - /* XXX: enable it in all cases */ - env->cpuid_features |= CPUID_APIC; - } + qemu_register_reset(main_cpu_reset, env); if (pci_enabled) { + env->cpuid_features |= CPUID_APIC; apic_init(env); } return env; -- 1.5.6.6