summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-08-12 15:03:20 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-08-12 15:03:20 -0500
commit9d054ea543c2f94ddea5db29cc908899a188c07d (patch)
treedcb57b99b07efb9a3869a721bb322842ced8ae8a /hw/i386/pc_piix.c
parent9fb7aaaf4c58c9108327f0ae4766087e3e496b47 (diff)
parent56383703c060777fd01aaf8d63d5f46d660e9fb9 (diff)
downloadhqemu-9d054ea543c2f94ddea5db29cc908899a188c07d.zip
hqemu-9d054ea543c2f94ddea5db29cc908899a188c07d.tar.gz
Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
QOM CPUState refactorings * Fix X86CPU Westmere CPUID for pc-*-1.4 and older * afaerber/tags/qom-cpu-for-anthony: pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older Conflicts: hw/i386/pc_piix.c hw/i386/pc_q35.c Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
-rw-r--r--hw/i386/pc_piix.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 7ad7c0b..55c24f2 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -264,6 +264,7 @@ static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
{
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);
has_pci_info = false;
pc_init_pci(args);
}
OpenPOWER on IntegriCloud