aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2013-08-09 11:11:36 -0300
committerAndreas Färber <afaerber@suse.de>2013-08-12 17:33:28 +0200
commit56383703c060777fd01aaf8d63d5f46d660e9fb9 (patch)
tree3e88a6dd86c3d60312bbf74034735935c42f1a72
parent8f3067bd86485f8cd03abc940ddb2b8467ef3627 (diff)
downloadqemu-56383703c060777fd01aaf8d63d5f46d660e9fb9.zip
qemu-56383703c060777fd01aaf8d63d5f46d660e9fb9.tar.gz
qemu-56383703c060777fd01aaf8d63d5f46d660e9fb9.tar.bz2
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 <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/i386/pc_piix.c1
-rw-r--r--hw/i386/pc_q35.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a19e172..1329f97 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -265,6 +265,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_1_5(args);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index be6013f..1d84ead 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -233,6 +233,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_1_5(args);
}