From: Eduardo Habkost Date: Fri, 9 Aug 2013 14:11:36 +0000 (-0300) Subject: pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older X-Git-Tag: v1.5.3~3^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9975e9916e70933315441616860a4b555b825e0d;p=thirdparty%2Fqemu.git pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older 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. Fix it by adding the missing compat code. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas Färber (cherry picked from commit 56383703c060777fd01aaf8d63d5f46d660e9fb9) Signed-off-by: Andreas Färber --- diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 06416ce74f4..aa03436d05a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -250,6 +250,7 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *args) { has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); pc_init_pci(args); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7888dfe03fc..1cceeb08a17 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -212,6 +212,7 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) { has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); pc_q35_init(args); }