From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M1jEp-0006Mh-KB for qemu-devel@nongnu.org; Wed, 06 May 2009 11:40:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M1jEl-0006MD-49 for qemu-devel@nongnu.org; Wed, 06 May 2009 11:40:51 -0400 Received: from [199.232.76.173] (port=46691 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M1jEl-0006MA-0M for qemu-devel@nongnu.org; Wed, 06 May 2009 11:40:47 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:17027) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M1jEk-0003HB-Dl for qemu-devel@nongnu.org; Wed, 06 May 2009 11:40:46 -0400 Message-ID: <4A01AF78.7050102@siemens.com> Date: Wed, 06 May 2009 17:40:40 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1241621382-21577-1-git-send-email-glommer@redhat.com> <1241621382-21577-2-git-send-email-glommer@redhat.com> <1241621382-21577-3-git-send-email-glommer@redhat.com> In-Reply-To: <1241621382-21577-3-git-send-email-glommer@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [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: Glauber Costa Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Glauber Costa wrote: > 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) Without doing my homework: What impact will it have on an emulated CPUs without [L]APIC? I'm thinking of -M isapc e.g. Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux