From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M1iRT-0005Gc-Jy for qemu-devel@nongnu.org; Wed, 06 May 2009 10:49:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M1iRP-0005F3-3T for qemu-devel@nongnu.org; Wed, 06 May 2009 10:49:51 -0400 Received: from [199.232.76.173] (port=60948 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M1iRO-0005Ej-Hl for qemu-devel@nongnu.org; Wed, 06 May 2009 10:49:46 -0400 Received: from mx2.redhat.com ([66.187.237.31]:38806) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M1iRN-0000Yd-Nx for qemu-devel@nongnu.org; Wed, 06 May 2009 10:49:46 -0400 From: Glauber Costa Date: Wed, 6 May 2009 10:49:40 -0400 Message-Id: <1241621382-21577-3-git-send-email-glommer@redhat.com> In-Reply-To: <1241621382-21577-2-git-send-email-glommer@redhat.com> References: <1241621382-21577-1-git-send-email-glommer@redhat.com> <1241621382-21577-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] move CPUID_APIC flag to where it belongs 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 We can safely do that inconditionally, so move to processor defined flags like any other flag. Signed-off-by: Glauber Costa --- hw/pc.c | 4 ---- target-i386/helper.c | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 351de83..b726c17 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -851,10 +851,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, } if (i != 0) env->halted = 1; - if (smp_cpus > 1) { - /* XXX: enable it in all cases */ - env->cpuid_features |= CPUID_APIC; - } if (pci_enabled) { apic_init(env); } diff --git a/target-i386/helper.c b/target-i386/helper.c index 2210412..2c11cd3 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -102,7 +102,7 @@ typedef struct x86_def_t { char model_id[48]; } x86_def_t; -#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE) +#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE | CPUID_APIC) #define PENTIUM_FEATURES (I486_FEATURES | CPUID_DE | CPUID_TSC | \ CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_MMX) #define PENTIUM2_FEATURES (PENTIUM_FEATURES | CPUID_PAE | CPUID_SEP | \ -- 1.5.6.6