commit 9d054ea543c2f94ddea5db29cc908899a188c07d
author Anthony Liguori <aliguori@us.ibm.com> Mon Aug 12 15:03:20 2013 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Mon Aug 12 15:03:20 2013 -0500
tree dcb57b99b07efb9a3869a721bb322842ced8ae8a
parent 9fb7aaaf4c58c9108327f0ae4766087e3e496b47
parent 56383703c060777fd01aaf8d63d5f46d660e9fb9

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>

hw/i386/pc_piix.c

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_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);
 }

hw/i386/pc_q35.c

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 6c7b401..bd25071 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)
 {
     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_q35_init(args);
 }