From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LupsH-0002f5-3L for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:21:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LupsB-0002Zr-7A for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:21:03 -0400 Received: from [199.232.76.173] (port=45862 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LupsA-0002Yz-BB for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:20:58 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41042) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lups9-0005jh-Hs for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:20:57 -0400 From: Glauber Costa Date: Fri, 17 Apr 2009 11:20:45 -0400 Message-Id: <1239981649-6366-3-git-send-email-glommer@redhat.com> In-Reply-To: <1239981649-6366-2-git-send-email-glommer@redhat.com> References: <1239981649-6366-1-git-send-email-glommer@redhat.com> <1239981649-6366-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] 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: jan.kiszka@siemens.com, 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