From 6d3c6d947de6e5721d8a011789909f55ffef833f Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 20 Aug 2013 15:09:50 +0200 Subject: [PATCH 22/28] pc: Remove PCLMULQDQ from Westmere on rhel6.x machine-types RH-Author: Eduardo Habkost Message-id: <1377011392-9336-6-git-send-email-ehabkost@redhat.com> Patchwork-id: 53612 O-Subject: [RHEL7 PATCH 5/7] pc: Remove PCLMULQDQ from Westmere on rhel6.x machine-types Bugzilla: 918907 RH-Acked-by: Markus Armbruster RH-Acked-by: Bandan Das RH-Acked-by: Miroslav Rezanina Bugzilla: 918907 Upstream status: commit 56383703c060777fd01aaf8d63d5f46d660e9fb9 commit 41cb383f42d0cb51d8e3e25e3ecebc954dd4196f made a guest-visible change by adding the PCLMULQDQ bit to Westmere without adding compatibility code to keep the ABI for older machine-types. Add the corresponding compat code to the rhel6.x machine-types (like it was done on upstream commit 56383703c060777fd01aaf8d63d5f46d660e9fb9 for pc-1.4). Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 1 + 1 file changed, 1 insertion(+) Signed-off-by: Miroslav Rezanina --- hw/i386/pc_piix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d5dc04d..846e2ce 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -868,6 +868,7 @@ static void pc_init_rhel650(QEMUMachineInitArgs *args) x86_cpu_compat_set_features("Penryn", FEAT_1_ECX, CPUID_EXT_X2APIC, 0); x86_cpu_compat_set_features("Nehalem", FEAT_1_ECX, CPUID_EXT_X2APIC, 0); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, CPUID_EXT_X2APIC, 0); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); x86_cpu_compat_set_features("Westmere", FEAT_8000_0001_EDX, CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_PGE | CPUID_EXT2_APIC | -- 1.7.1