From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaTws-0004Ch-27 for qemu-devel@nongnu.org; Fri, 11 Sep 2015 15:25:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaTwq-0006A6-3I for qemu-devel@nongnu.org; Fri, 11 Sep 2015 15:25:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaTwp-00069b-PV for qemu-devel@nongnu.org; Fri, 11 Sep 2015 15:25:24 -0400 From: Eduardo Habkost Date: Fri, 11 Sep 2015 16:25:06 -0300 Message-Id: <1441999509-26881-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1441999509-26881-1-git-send-email-ehabkost@redhat.com> References: <1441999509-26881-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] target-i386: Expand PPRO_FEATURES on qemu64/qemu32 definitions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini The qemu64 and qemu32 CPU models won't be Pentium Pro supersets anymore because the DE feature will be removed. Copy PPRO_FEATURES into their definitions so we can change the CPU models later. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 32fee00..d505743 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -701,7 +701,10 @@ static X86CPUDefinition builtin_x86_defs[] = { .model = 6, .stepping = 3, .features[FEAT_1_EDX] = - PPRO_FEATURES | + CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC | + CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | + CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | + CPUID_PAE | CPUID_SEP | CPUID_APIC | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_PSE36, .features[FEAT_1_ECX] = @@ -804,7 +807,10 @@ static X86CPUDefinition builtin_x86_defs[] = { .model = 6, .stepping = 3, .features[FEAT_1_EDX] = - PPRO_FEATURES, + CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC | + CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | + CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | + CPUID_PAE | CPUID_SEP | CPUID_APIC, .features[FEAT_1_ECX] = CPUID_EXT_SSE3 | CPUID_EXT_POPCNT, .xlevel = 0x80000004, -- 2.1.0